qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去除达梦驱动

This commit is contained in:
钱涛 2024-01-25 11:38:38 +08:00
parent ead242cdb6
commit 6fc8d8fdee
49 changed files with 94 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/biz/SIAccountBiz.java
View File

@ -50,7 +50,7 @@ import com.engine.salary.util.page.SalaryPageUtil;
import com.engine.salary.util.valid.ValidUtil;
import com.google.common.collect.Lists;
import com.wbi.util.StringUtil;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.math.NumberUtils;

2
src/com/engine/salary/biz/SIArchivesBiz.java
View File

@ -51,7 +51,7 @@ import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.SalaryPageUtil;
import com.engine.salary.wrapper.TaxAgentWrapper;
import com.google.common.collect.Lists;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;

2
src/com/engine/salary/entity/agency/bo/PaymentAgencyBO.java
View File

@ -4,7 +4,7 @@ import com.engine.salary.entity.agency.dto.PaymentAgencyFormDTO;
import com.engine.salary.entity.agency.dto.PaymentAgencyListDTO;
import com.engine.salary.entity.agency.po.PaymentAgencyPO;
import com.engine.salary.enums.sicategory.DeleteTypeEnum;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import java.time.LocalDateTime;

2
src/com/engine/salary/entity/report/bo/SalaryAcctResultReportBO.java
View File

@ -6,7 +6,7 @@ import com.engine.salary.entity.report.po.SalaryAcctResultReportPO;
import com.engine.salary.entity.salaryacct.param.SalaryAcctResultSaveParam;
import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO;
import com.engine.salary.entity.salaryacct.po.SalaryAcctResultTempPO;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.math.NumberUtils;

2
src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultLogBO.java
View File

@ -3,7 +3,7 @@ package com.engine.salary.entity.salaryacct.bo;
import com.engine.salary.entity.salaryacct.po.SalaryAcctResultLogPO;
import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO;
import com.engine.salary.enums.salaryaccounting.SalaryAcctResultDataSourceEnum;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.lang3.math.NumberUtils;
import java.util.ArrayList;

2
src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java
View File

@ -18,7 +18,7 @@ import com.engine.salary.enums.taxagent.TaxAgentEmpChangeTypeEnum;
import com.engine.salary.util.SalaryEntityUtil;
import com.engine.salary.util.SalaryI18nUtil;
import com.google.common.collect.Lists;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
View File

@ -25,7 +25,7 @@ import com.engine.salary.util.excel.ExcelComment;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;

2
src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java
View File

@ -257,7 +257,7 @@ public class SalaryItemBO {
*/
public static SalaryItemPO convert2SalaryItemPO(SalaryItemSaveParam saveParam, Long employeeId) {
Date now = new Date();
long id = dm.jdbc.util.IdGenerator.generate();
long id = com.engine.salary.util.db.IdGenerator.generate();
SalaryItemPO salaryItemPO = SalaryItemPO.builder()
.id(id)
.code(IdGenerator.getUUID())

2
src/com/engine/salary/entity/salaryitem/bo/SysSalaryItemBO.java
View File

@ -10,7 +10,7 @@ import com.engine.salary.enums.SalarySystemTypeEnum;
import com.engine.salary.enums.SalaryValueTypeEnum;
import com.engine.salary.enums.salaryitem.SalaryDataTypeEnum;
import com.engine.salary.util.SalaryI18nUtil;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;

2
src/com/engine/salary/entity/salarysob/bo/SalarySobBackItemBO.java
View File

@ -8,7 +8,7 @@ import com.engine.salary.entity.salarysob.po.SalarySobBackItemPO;
import com.engine.salary.entity.salarysob.po.SalarySobDefaultBackItemPO;
import com.engine.salary.util.SalaryEntityUtil;
import com.google.common.collect.Lists;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections.CollectionUtils;
import java.util.Collections;

2
src/com/engine/salary/entity/salarysob/bo/SalarySobDuplicateBO.java
View File

@ -4,7 +4,7 @@ import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.entity.salarysob.po.*;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import lombok.AllArgsConstructor;
import lombok.Data;
import org.apache.commons.collections4.CollectionUtils;

2
src/com/engine/salary/entity/salarysob/bo/SalarySobItemBO.java
View File

@ -7,7 +7,7 @@ import com.engine.salary.enums.sicategory.DeleteTypeEnum;
import com.engine.salary.util.SalaryEntityUtil;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import lombok.Data;
import lombok.experimental.Accessors;
import org.apache.commons.lang3.math.NumberUtils;

2
src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBaseInfoBO.java
View File

@ -7,7 +7,7 @@ import com.engine.salary.enums.siaccount.EmployeeStatusEnum;
import com.engine.salary.enums.taxagent.TaxAgentEmpChangeTypeEnum;
import com.engine.salary.util.SalaryEntityUtil;
import com.google.common.collect.Lists;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
src/com/engine/salary/entity/sicategory/bo/ICategoryBO.java
View File

@ -5,7 +5,7 @@ import com.engine.salary.entity.sicategory.dto.ICategoryFormDTO;
import com.engine.salary.entity.sicategory.po.ICategoryPO;
import com.engine.salary.enums.sicategory.DataTypeEnum;
import com.engine.salary.util.SalaryEnumUtil;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import java.util.Date;
import java.util.Objects;

2
src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java
View File

@ -27,7 +27,7 @@ import com.engine.salary.util.page.Column;
import com.engine.salary.util.page.PageInfo;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

2
src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java
View File

@ -22,7 +22,7 @@ import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.page.PageInfo;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import lombok.Data;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;

2
src/com/engine/salary/report/service/impl/SalaryStatisticsDimensionServiceImpl.java
View File

@ -21,7 +21,7 @@ import com.engine.salary.util.db.MapperProxyFactory;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.SalaryPageUtil;
import com.google.common.collect.Lists;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;

2
src/com/engine/salary/report/service/impl/SalaryStatisticsEchartsServiceImpl.java
View File

@ -11,7 +11,7 @@ import com.engine.salary.report.service.SalaryStatisticsEchartsService;
import com.engine.salary.util.SalaryAssert;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.db.MapperProxyFactory;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;

2
src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java
View File

@ -13,7 +13,7 @@ import com.engine.salary.util.SalaryAssert;
import com.engine.salary.util.SalaryEntityUtil;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.db.MapperProxyFactory;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;

2
src/com/engine/salary/report/service/impl/SalaryStatisticsPushServiceImpl.java
View File

@ -32,7 +32,7 @@ import com.engine.salary.util.db.MapperProxyFactory;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.SalaryPageUtil;
import com.google.common.collect.Lists;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;

2
src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
View File

@ -37,7 +37,7 @@ import com.engine.salary.util.page.SalaryPageUtil;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;

2
src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
View File

@ -55,7 +55,7 @@ import com.engine.salary.util.valid.ValidUtil;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;

2
src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
View File

@ -27,7 +27,7 @@ import com.engine.salary.util.page.SalaryPageUtil;
import com.engine.salary.util.valid.ValidUtil;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate;

2
src/com/engine/salary/service/impl/SIAccountServiceImpl.java
View File

@ -74,7 +74,7 @@ import com.engine.salary.wrapper.SalaryFormulaWrapper;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.mzlion.core.utils.BeanUtils;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Sheet;

2
src/com/engine/salary/service/impl/SIBalanceServiceImpl.java
View File

@ -34,7 +34,7 @@ import com.engine.salary.util.SalaryEntityUtil;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.db.MapperProxyFactory;
import com.google.common.collect.Lists;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import weaver.hrm.User;

2
src/com/engine/salary/service/impl/SICompensationServiceImpl.java
View File

@ -33,7 +33,7 @@ import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.db.MapperProxyFactory;
import com.engine.salary.util.page.Column;
import com.google.common.collect.Lists;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.springframework.beans.BeanUtils;
import weaver.hrm.User;

2
src/com/engine/salary/service/impl/SISchemeServiceImpl.java
View File

@ -58,7 +58,7 @@ import com.engine.salary.util.page.SalaryPageUtil;
import com.engine.salary.util.valid.ValidUtil;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;

2
src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
View File

@ -49,7 +49,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.wbi.util.Util;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.ListUtils;

2
src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
View File

@ -35,7 +35,7 @@ import com.engine.salary.util.db.MapperProxyFactory;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.SalaryPageUtil;
import com.engine.salary.util.valid.ValidUtil;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;

2
src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
View File

@ -54,7 +54,7 @@ import com.google.common.collect.Sets;
import com.weaver.util.threadPool.ThreadPoolUtil;
import com.weaver.util.threadPool.constant.ModulePoolEnum;
import com.weaver.util.threadPool.entity.LocalRunnable;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;

2
src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
View File

@ -48,7 +48,7 @@ import com.engine.salary.util.page.SalaryPageUtil;
import com.engine.salary.util.valid.ValidUtil;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.time.DateUtils;

2
src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java
View File

@ -22,7 +22,7 @@ import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl;
import com.engine.salary.util.JsonUtil;
import com.engine.salary.util.SalaryEntityUtil;
import com.google.common.collect.Lists;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.math.NumberUtils;
import org.apache.commons.lang3.StringUtils;

2
src/com/engine/salary/service/impl/SalaryBillItemNameServiceImpl.java
View File

@ -14,7 +14,7 @@ import com.engine.salary.service.SalaryItemService;
import com.engine.salary.service.SalaryTemplateService;
import com.engine.salary.util.SalaryEntityUtil;
import com.google.common.collect.Lists;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.math.NumberUtils;
import org.apache.commons.lang3.StringUtils;

2
src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
View File

@ -28,7 +28,7 @@ import com.engine.salary.service.SalarySobRangeService;
import com.engine.salary.sys.entity.po.SalarySysConfPO;
import com.engine.salary.util.SalaryEntityUtil;
import com.google.common.collect.Lists;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;

2
src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java
View File

@ -22,7 +22,7 @@ import com.engine.salary.util.JsonUtil;
import com.engine.salary.util.db.MapperProxyFactory;
import com.engine.salary.util.valid.ValidUtil;
import com.google.common.collect.Lists;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;

2
src/com/engine/salary/service/impl/SalarySendServiceImpl.java
View File

@ -61,7 +61,7 @@ import com.engine.salary.util.excel.ExcelUtil;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.SalaryPageUtil;
import com.google.common.collect.Lists;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;

2
src/com/engine/salary/service/impl/SalarySobExtRangeServiceImpl.java
View File

@ -20,7 +20,7 @@ import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.SalaryPageUtil;
import com.engine.salary.util.valid.ValidUtil;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import weaver.hrm.User;

2
src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
View File

@ -25,7 +25,7 @@ import com.engine.salary.util.SalaryEntityUtil;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.db.MapperProxyFactory;
import com.engine.salary.util.valid.ValidUtil;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;

2
src/com/engine/salary/service/impl/SalarySobServiceImpl.java
View File

@ -36,7 +36,7 @@ import com.engine.salary.util.page.SalaryPageUtil;
import com.engine.salary.util.valid.RuntimeTypeEnum;
import com.engine.salary.util.valid.ValidUtil;
import com.google.common.collect.Lists;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;

2
src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
View File

@ -28,7 +28,7 @@ import com.engine.salary.util.SalaryEntityUtil;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.SalaryPageUtil;
import com.mzlion.core.utils.BeanUtils;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;

2
src/com/engine/salary/service/impl/TaxAgentAdminServiceImpl.java
View File

@ -7,7 +7,7 @@ import com.engine.salary.mapper.taxagent.TaxAgentAdminMapper;
import com.engine.salary.service.TaxAgentAdminService;
import com.engine.salary.util.db.MapperProxyFactory;
import com.google.common.collect.Lists;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import java.util.Collection;

2
src/com/engine/salary/service/impl/TaxAgentBaseServiceImpl.java
View File

@ -15,7 +15,7 @@ import com.engine.salary.service.SalaryAcctRecordService;
import com.engine.salary.service.TaxAgentBaseService;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.db.MapperProxyFactory;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import weaver.hrm.User;

2
src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java
View File

@ -17,7 +17,7 @@ import com.engine.salary.service.TaxAgentEmpService;
import com.engine.salary.util.SalaryEntityUtil;
import com.engine.salary.util.db.MapperProxyFactory;
import com.google.common.collect.Lists;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import weaver.hrm.User;

2
src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
View File

@ -38,7 +38,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.weaver.util.threadPool.ThreadPoolUtil;
import com.weaver.util.threadPool.entity.LocalRunnable;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;

2
src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
View File

@ -50,7 +50,7 @@ import com.google.common.collect.Lists;
import com.weaver.util.threadPool.ThreadPoolUtil;
import com.weaver.util.threadPool.constant.ModulePoolEnum;
import com.weaver.util.threadPool.entity.LocalRunnable;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;

2
src/com/engine/salary/timer/SyncTaxAgentEmp2SobEmpJob.java
View File

@ -8,7 +8,7 @@ import com.engine.salary.service.SalarySobRangeService;
import com.engine.salary.service.SalarySobService;
import com.engine.salary.service.impl.SalarySobRangeServiceImpl;
import com.engine.salary.service.impl.SalarySobServiceImpl;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import weaver.general.BaseBean;

2
src/com/engine/salary/util/SalaryTokenUtil.java
View File

@ -3,7 +3,7 @@ package com.engine.salary.util;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.engine.salary.exception.SalaryRunTimeException;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.lang3.StringUtils;
import weaver.conn.RecordSet;
import weaver.general.BaseBean;

46
src/com/engine/salary/util/db/IdGenerator.java Normal file
View File

@ -0,0 +1,46 @@
package com.engine.salary.util.db;
import java.util.concurrent.atomic.AtomicLong;
public class IdGenerator {
private static AtomicLong next = new AtomicLong(1L);
public static final int ID_LENGTH_36 = 36;
public IdGenerator() {
}
public static long generate() {
return System.currentTimeMillis() + next.getAndIncrement();
}
public static String generateId() {
return System.currentTimeMillis() + String.valueOf(next.getAndIncrement());
}
public static String generateStrId() {
return System.currentTimeMillis() + generateStrId(36);
}
public static String generateStrId(int idLength) {
if (idLength >= 1 && idLength <= 36) {
char[] srcChars = new char[]{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'g', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
char[] chars = new char[idLength];
for(int i = 0; i < idLength; ++i) {
if (i != 8 && i != 13 && i != 18 && i != 23) {
if (i == 0) {
chars[i] = srcChars[(int)(Math.random() * 26.0D) % 26];
} else {
chars[i] = srcChars[(int)(Math.random() * 36.0D) % 36];
}
} else {
chars[i] = '_';
}
}
return new String(chars);
} else {
return "";
}
}
}

2
src/com/engine/salary/wrapper/SalarySobWrapper.java
View File

@ -27,7 +27,7 @@ import com.engine.salary.util.SalaryEntityUtil;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.SalarySobUtil;
import com.engine.salary.util.page.PageInfo;
import dm.jdbc.util.IdGenerator;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import weaver.hrm.User;