diff --git a/src/com/engine/salary/biz/SalaryArchiveItemBiz.java b/src/com/engine/salary/biz/SalaryArchiveItemBiz.java index e36c02296..d2a79b233 100644 --- a/src/com/engine/salary/biz/SalaryArchiveItemBiz.java +++ b/src/com/engine/salary/biz/SalaryArchiveItemBiz.java @@ -1,7 +1,7 @@ package com.engine.salary.biz; +import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.encrypt.archive.SalaryArchiveItemPOEncrypt; -import com.engine.salary.encrypt.archive.SalaryItemAdjustRecordListDTOEncrypt; import com.engine.salary.entity.salaryarchive.dto.SalaryItemAdjustRecordListDTO; import com.engine.salary.entity.salaryarchive.param.SalaryArchiveItemQueryParam; import com.engine.salary.entity.salaryarchive.param.SalaryItemAdjustRecordQueryParam; @@ -18,13 +18,14 @@ import java.util.ArrayList; import java.util.List; public class SalaryArchiveItemBiz { + public EncryptUtil encryptUtil = new EncryptUtil(); public List getCurrentEffectiveItemList(SalaryArchiveItemQueryParam build) { SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { SalaryArchiveItemMapper mapper = sqlSession.getMapper(SalaryArchiveItemMapper.class); List salaryArchiveItemPOS = mapper.listByParam(build); - return SalaryArchiveItemPOEncrypt.decryptSalaryArchiveItemPOList(salaryArchiveItemPOS); + return encryptUtil.decryptList(salaryArchiveItemPOS, SalaryArchiveItemPO.class); } finally { sqlSession.close(); } @@ -56,9 +57,9 @@ public class SalaryArchiveItemBiz { try { SalaryArchiveItemMapper mapper = sqlSession.getMapper(SalaryArchiveItemMapper.class); List ineffectiveSalaryItems = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(build.getSalaryArchivesIds())){ + if (CollectionUtils.isNotEmpty(build.getSalaryArchivesIds())) { List salaryArchivesIds = (List) build.getSalaryArchivesIds(); - List> partition = Lists.partition(salaryArchivesIds,1000); + List> partition = Lists.partition(salaryArchivesIds, 1000); partition.forEach(list -> { build.setSalaryArchivesIds(list); ineffectiveSalaryItems.addAll(mapper.getIneffectiveSalaryItems(build)); @@ -86,7 +87,7 @@ public class SalaryArchiveItemBiz { SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { SalaryArchiveItemMapper mapper = sqlSession.getMapper(SalaryArchiveItemMapper.class); - List> partition = Lists.partition(effectiveSalaryItemDels, 999); + List> partition = Lists.partition(effectiveSalaryItemDels, 999); partition.forEach(mapper::deleteBatchIds); sqlSession.commit(); } finally { @@ -95,13 +96,13 @@ public class SalaryArchiveItemBiz { } public void batchInsert(List salaryArchiveItemNews) { - if(CollectionUtils.isEmpty(salaryArchiveItemNews)){ + if (CollectionUtils.isEmpty(salaryArchiveItemNews)) { return; } SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { SalaryArchiveItemMapper mapper = sqlSession.getMapper(SalaryArchiveItemMapper.class); - SalaryArchiveItemPOEncrypt.encryptSalaryArchiveItemPOList(salaryArchiveItemNews); + encryptUtil.encryptList(salaryArchiveItemNews, SalaryArchiveItemPO.class); List> partition = Lists.partition(salaryArchiveItemNews, 100); partition.forEach(mapper::batchInsert); sqlSession.commit(); @@ -140,7 +141,7 @@ public class SalaryArchiveItemBiz { SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { SalaryArchiveItemMapper mapper = sqlSession.getMapper(SalaryArchiveItemMapper.class); - return SalaryItemAdjustRecordListDTOEncrypt.decryptSalaryItemAdjustRecordListDTOList(mapper.salaryItemAdjustRecordList(queryParam, salaryItemIds)); + return encryptUtil.decryptList(mapper.salaryItemAdjustRecordList(queryParam, salaryItemIds), SalaryItemAdjustRecordListDTO.class); } finally { sqlSession.close(); } @@ -163,7 +164,7 @@ public class SalaryArchiveItemBiz { SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize()); SalaryArchiveItemMapper mapper = sqlSession.getMapper(SalaryArchiveItemMapper.class); List salaryItemAdjustRecordListDTOS = mapper.salaryItemAdjustRecordList(queryParam, salaryItemIds); - SalaryItemAdjustRecordListDTOEncrypt.decryptSalaryItemAdjustRecordListDTOList(salaryItemAdjustRecordListDTOS); + encryptUtil.decryptList(salaryItemAdjustRecordListDTOS, SalaryItemAdjustRecordListDTO.class); PageInfo page = new PageInfo(salaryItemAdjustRecordListDTOS, SalaryItemAdjustRecordListDTO.class); return page; } finally { diff --git a/src/com/engine/salary/entity/salaryarchive/dto/SalaryItemAdjustRecordListDTO.java b/src/com/engine/salary/entity/salaryarchive/dto/SalaryItemAdjustRecordListDTO.java index e1560f5b5..ede032ccb 100644 --- a/src/com/engine/salary/entity/salaryarchive/dto/SalaryItemAdjustRecordListDTO.java +++ b/src/com/engine/salary/entity/salaryarchive/dto/SalaryItemAdjustRecordListDTO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.salaryarchive.dto; +import com.engine.salary.annotation.Encrypt; import com.engine.salary.annotation.TableTitle; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -50,9 +51,11 @@ public class SalaryItemAdjustRecordListDTO { private String adjustItem; @TableTitle(title = "调整前", dataIndex = "adjustBefore", key = "adjustBefore") + @Encrypt private String adjustBefore; @TableTitle(title = "调整后", dataIndex = "adjustAfter", key = "adjustAfter") + @Encrypt private String adjustAfter; @TableTitle(title = "调整原因", dataIndex = "adjustReason", key = "adjustReason") diff --git a/src/com/engine/salary/entity/salaryarchive/po/SalaryArchiveItemPO.java b/src/com/engine/salary/entity/salaryarchive/po/SalaryArchiveItemPO.java index be3c54598..4a3a9306a 100644 --- a/src/com/engine/salary/entity/salaryarchive/po/SalaryArchiveItemPO.java +++ b/src/com/engine/salary/entity/salaryarchive/po/SalaryArchiveItemPO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.salaryarchive.po; +import com.engine.salary.annotation.Encrypt; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -56,6 +57,7 @@ public class SalaryArchiveItemPO { /** * 薪资项目值 */ + @Encrypt private String itemValue; /**