From 9128054a659abbe8eaf01f3c519bf587d75d9e6c Mon Sep 17 00:00:00 2001 From: "583641232@qq.com" <583641232@qq.com> Date: Tue, 20 Aug 2024 17:16:43 +0800 Subject: [PATCH] :sparkles: pom --- .../datacenter/CarInfoController.java | 6 +- .../datacenter/PublicFamilyController.java | 6 +- .../datacenter/RealEstateController.java | 19 +---- .../TransactionPartnerController.java | 6 +- .../impl/AnalysisReportServiceImpl.java | 17 +++- .../service/impl/LeaderTaskService.java | 14 +++- .../datacenter/domain/RealEstate.java | 1 - ....java => PlateNumberInfoExportAllDto.java} | 2 +- .../vo/GetOpeningAccountInfoListReq.java | 4 +- .../datacenter/mapper/CarInfoMapper.java | 43 ---------- .../datacenter/mapper/PublicFamilyMapper.java | 16 ---- .../datacenter/mapper/RealEstateMapper.java | 15 ---- .../mapper/TransactionPartnerMapper.java | 17 ---- .../service/QueryCenterService.java | 83 ++++++------------- .../service/impl/BankServiceImpl.java | 2 +- .../service/impl/CarInfoServiceImpl.java | 16 +--- .../CollectionInformationServiceImpl.java | 10 +-- .../service/impl/PlateNumberServiceImpl.java | 8 +- .../service/impl/PublicFamilyServiceImpl.java | 46 +++------- .../service/impl/RealEstateServiceImpl.java | 28 ++----- .../impl/TransactionPartnerServiceImpl.java | 29 +++---- 21 files changed, 100 insertions(+), 288 deletions(-) rename cas-system/src/main/java/com/inscloudtech/datacenter/domain/dto/export/{PlateNumberExportAllDto.java => PlateNumberInfoExportAllDto.java} (95%) delete mode 100644 cas-system/src/main/java/com/inscloudtech/datacenter/mapper/CarInfoMapper.java delete mode 100644 cas-system/src/main/java/com/inscloudtech/datacenter/mapper/PublicFamilyMapper.java delete mode 100644 cas-system/src/main/java/com/inscloudtech/datacenter/mapper/RealEstateMapper.java delete mode 100644 cas-system/src/main/java/com/inscloudtech/datacenter/mapper/TransactionPartnerMapper.java diff --git a/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/CarInfoController.java b/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/CarInfoController.java index 8eb3734..e169490 100644 --- a/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/CarInfoController.java +++ b/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/CarInfoController.java @@ -11,12 +11,10 @@ import com.inscloudtech.common.core.domain.PageQuery; import com.inscloudtech.common.core.domain.R; import com.inscloudtech.common.core.page.TableDataInfo; import com.inscloudtech.common.enums.BusinessType; -import com.inscloudtech.common.excel.ExcelResult; import com.inscloudtech.common.utils.BeanCopyUtils; import com.inscloudtech.common.utils.poi.ExcelUtil; import com.inscloudtech.datacenter.domain.CarInfo; -import com.inscloudtech.datacenter.domain.PublicFamily; -import com.inscloudtech.datacenter.mapper.CarInfoMapper; +import com.inscloudtech.datacenter.mapper.es.CarInfoEsMapper; import com.inscloudtech.datacenter.service.ICarInfoService; import com.inscloudtech.system.service.ISysOssService; import lombok.RequiredArgsConstructor; @@ -89,7 +87,7 @@ public class CarInfoController extends BaseController { * 修改重点人员资产-车辆信息 */ //"修改车辆信息") - @UpdateLog(title = "重点人员资产-车辆信息",mapperClass = CarInfoMapper.class, businessType = BusinessType.UPDATE) + @UpdateLog(title = "重点人员资产-车辆信息",mapperClass = CarInfoEsMapper.class, businessType = BusinessType.UPDATE) @PutMapping() public R edit(@RequestBody CarInfo bo) { bo.setUpdateBy(getUsername()); diff --git a/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/PublicFamilyController.java b/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/PublicFamilyController.java index 5363294..7d6c507 100644 --- a/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/PublicFamilyController.java +++ b/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/PublicFamilyController.java @@ -10,12 +10,10 @@ import com.inscloudtech.common.core.domain.PageQuery; import com.inscloudtech.common.core.domain.R; import com.inscloudtech.common.core.page.TableDataInfo; import com.inscloudtech.common.enums.BusinessType; -import com.inscloudtech.common.excel.ExcelResult; import com.inscloudtech.common.utils.BeanCopyUtils; import com.inscloudtech.common.utils.poi.ExcelUtil; import com.inscloudtech.datacenter.domain.PublicFamily; -import com.inscloudtech.datacenter.domain.TransactionPartner; -import com.inscloudtech.datacenter.mapper.PublicFamilyMapper; +import com.inscloudtech.datacenter.mapper.es.PublicFamilyEsMapper; import com.inscloudtech.datacenter.service.IPublicFamilyService; import com.inscloudtech.system.service.ISysOssService; import lombok.RequiredArgsConstructor; @@ -108,7 +106,7 @@ public class PublicFamilyController extends BaseController { * 修改数据中心-职工家属 */ //"修改职工家属信息") - @UpdateLog(title = "职工家属",mapperClass = PublicFamilyMapper.class, businessType = BusinessType.UPDATE) + @UpdateLog(title = "职工家属",mapperClass = PublicFamilyEsMapper.class, businessType = BusinessType.UPDATE) @Log(title = "职工家属", businessType = BusinessType.UPDATE) @PutMapping() public R edit(@RequestBody PublicFamily bo) { diff --git a/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/RealEstateController.java b/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/RealEstateController.java index 8971446..d19ebc5 100644 --- a/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/RealEstateController.java +++ b/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/RealEstateController.java @@ -2,16 +2,8 @@ package com.inscloudtech.web.controller.datacenter; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.io.FileUtil; -import cn.hutool.json.JSONUtil; -import com.aspose.cells.Cell; -import com.aspose.cells.Cells; -import com.aspose.cells.Workbook; -import com.aspose.cells.Worksheet; import com.inscloudtech.analysiscenter.domain.AnalysisDto; -import com.inscloudtech.bankStatementAnalysis.helper.HelperUtil; import com.inscloudtech.bankStatementAnalysis.service.ImportService; -import com.inscloudtech.bankStatementAnalysis.util.AsposeUtil; import com.inscloudtech.common.annotation.Log; import com.inscloudtech.common.annotation.UpdateLog; import com.inscloudtech.common.core.controller.BaseController; @@ -19,12 +11,10 @@ import com.inscloudtech.common.core.domain.PageQuery; import com.inscloudtech.common.core.domain.R; import com.inscloudtech.common.core.page.TableDataInfo; import com.inscloudtech.common.enums.BusinessType; -import com.inscloudtech.common.excel.ExcelResult; -import com.inscloudtech.common.excel.ImportExcelHelper; import com.inscloudtech.common.utils.BeanCopyUtils; import com.inscloudtech.common.utils.poi.ExcelUtil; import com.inscloudtech.datacenter.domain.RealEstate; -import com.inscloudtech.datacenter.mapper.RealEstateMapper; +import com.inscloudtech.datacenter.mapper.es.RealEstateEsMapper; import com.inscloudtech.datacenter.service.IRealEstateService; import com.inscloudtech.system.service.ISysOssService; @@ -36,11 +26,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.io.File; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardCopyOption; import java.util.*; @@ -184,7 +169,7 @@ public class RealEstateController extends BaseController { * 修改重点人员资产-不动产信息 */ //"修改不动产信息") - @UpdateLog(title = "不动产信息",mapperClass = RealEstateMapper.class, businessType = BusinessType.UPDATE) + @UpdateLog(title = "不动产信息",mapperClass = RealEstateEsMapper.class, businessType = BusinessType.UPDATE) @PutMapping() public R edit(@RequestBody RealEstate bo) { return R.ok(iRealEstateService.updateByBo(bo)); diff --git a/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/TransactionPartnerController.java b/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/TransactionPartnerController.java index a62af68..2f22333 100644 --- a/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/TransactionPartnerController.java +++ b/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/TransactionPartnerController.java @@ -10,12 +10,10 @@ import com.inscloudtech.common.core.domain.PageQuery; import com.inscloudtech.common.core.domain.R; import com.inscloudtech.common.core.page.TableDataInfo; import com.inscloudtech.common.enums.BusinessType; -import com.inscloudtech.common.excel.ExcelResult; import com.inscloudtech.common.utils.BeanCopyUtils; import com.inscloudtech.common.utils.poi.ExcelUtil; -import com.inscloudtech.datacenter.domain.RealEstate; import com.inscloudtech.datacenter.domain.TransactionPartner; -import com.inscloudtech.datacenter.mapper.TransactionPartnerMapper; +import com.inscloudtech.datacenter.mapper.es.TransactionPartnerEsMapper; import com.inscloudtech.datacenter.service.ITransactionPartnerService; import com.inscloudtech.system.service.ISysOssService; @@ -152,7 +150,7 @@ public class TransactionPartnerController extends BaseController { * 修改交易对象 */ //"修改交易对象") - @UpdateLog(title = "交易对象", mapperClass = TransactionPartnerMapper.class) + @UpdateLog(title = "交易对象", mapperClass = TransactionPartnerEsMapper.class) @Log(title = "交易对象", businessType = BusinessType.UPDATE) @PutMapping() public R edit(@RequestBody TransactionPartner update) { diff --git a/cas-system/src/main/java/com/inscloudtech/analysiscenter/service/impl/AnalysisReportServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/analysiscenter/service/impl/AnalysisReportServiceImpl.java index f422a46..66da173 100644 --- a/cas-system/src/main/java/com/inscloudtech/analysiscenter/service/impl/AnalysisReportServiceImpl.java +++ b/cas-system/src/main/java/com/inscloudtech/analysiscenter/service/impl/AnalysisReportServiceImpl.java @@ -1103,8 +1103,16 @@ public class AnalysisReportServiceImpl implements IAnalysisReportService { List bsList = tpEntry.getValue(); try { - Set tpCounterpartyAccountSet = bsList.stream().filter(item -> StrUtil.isNotEmpty(item.getCounterpartyAccount())).map(BankStatement::getCounterpartyAccount).collect(Collectors.toSet()); - Set tpCounterpartyNameSet = bsList.stream().filter(item -> StrUtil.isNotEmpty(item.getCounterpartyName())).map(BankStatement::getCounterpartyName).collect(Collectors.toSet()); + Set tpCounterpartyAccountSet = new HashSet<>(); + Set tpCounterpartyNameSet = new HashSet<>(); + bsList.stream().forEach(item ->{ + if(StrUtil.isNotEmpty(item.getCounterpartyAccount())){ + tpCounterpartyAccountSet.add(item.getCounterpartyAccount()); + } + if(StrUtil.isNotEmpty(item.getCounterpartyName())){ + tpCounterpartyNameSet.add(item.getCounterpartyName()); + } + }); //括内部人，也不包括自己。比如敖云松的报告，就不包括内部人藏美芳，因为他们是同事、必然是间接关系（有共同的交易对象即公司给他们发工资）， Integer personType = groupByLabel.get(tpCardHolderName); @@ -1122,8 +1130,11 @@ public class AnalysisReportServiceImpl implements IAnalysisReportService { rst.add(indirectItem); } }catch (Exception e){ - System.out.println("JSONUtil.toJsonStr(bsList) = " + JSONUtil.toJsonStr(bsList)); + System.out.println("tpCardHolderName" + tpCardHolderName); + e.printStackTrace(); + throw new RuntimeException("报错中断"); + } } diff --git a/cas-system/src/main/java/com/inscloudtech/caseMange/service/impl/LeaderTaskService.java b/cas-system/src/main/java/com/inscloudtech/caseMange/service/impl/LeaderTaskService.java index 13c7392..2c24e68 100644 --- a/cas-system/src/main/java/com/inscloudtech/caseMange/service/impl/LeaderTaskService.java +++ b/cas-system/src/main/java/com/inscloudtech/caseMange/service/impl/LeaderTaskService.java @@ -8,6 +8,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.inscloudtech.analysiscenter.domain.AnalysisReport; +import com.inscloudtech.analysiscenter.domain.AnalysisResult; +import com.inscloudtech.analysiscenter.mapper.AnalysisReportMapper; +import com.inscloudtech.analysiscenter.mapper.AnalysisResultMapper; import com.inscloudtech.bankStatementAnalysis.util.DesUtil; import com.inscloudtech.common.constant.Constants; import com.inscloudtech.common.core.domain.entity.SysDictData; @@ -27,12 +30,14 @@ import com.inscloudtech.caseMange.domain.vo.*; import com.inscloudtech.caseMange.mapper.SysLawCaseMapper; import com.inscloudtech.caseMange.service.ILeaderTaskService; import com.inscloudtech.caseMange.service.ISysLawCaseInvestigatorService; +import com.inscloudtech.system.domain.SysOss; import com.inscloudtech.system.domain.SysUserRole; import com.inscloudtech.system.mapper.SysUserMapper; import com.inscloudtech.system.mapper.SysUserRoleMapper; import com.inscloudtech.system.service.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.elasticsearch.index.analysis.Analysis; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -52,7 +57,8 @@ public class LeaderTaskService implements ILeaderTaskService { private final ISysConfigService configService; private final SysLawCaseMapper lawCaseMapper; -// private final BankService bankService; + private final AnalysisResultMapper analysisResultMapper; + private final AnalysisReportMapper analysisReportMapper; private final ISysLawCaseInvestigatorService sysLawCaseInvestigatorService; @@ -81,12 +87,16 @@ public class LeaderTaskService implements ILeaderTaskService { String indexArr[] = {IndexInitService.TRANSACTION_PARTNER_INDEX,IndexInitService.PUBLIC_FAMILY_INDEX, IndexInitService.REAL_ESTATE_INDEX,IndexInitService.CAR_INFO_INDEX, IndexInitService.OTHER_ASSETS_INDEX,IndexInitService.OTHER_INFORMATION_INDEX, - IndexInitService.OTHER_INFORMATION_INDEX}; + IndexInitService.COLLECTION_INFORMATION_INDEX, + IndexInitService.PLATE_NUMBER_INDEX}; for (String index : indexArr) { query.setIndex(index); queryCenterService.deleteDataByCondition(query); } sysOssService.deleteByCaseId(query.getCaseId()); + analysisResultMapper.delete(Wrappers.lambdaQuery(AnalysisResult.class).eq(AnalysisResult::getCaseId, query.getCaseId())); + analysisReportMapper.delete(Wrappers.lambdaQuery(AnalysisReport.class).eq(AnalysisReport::getCaseId, query.getCaseId())); + } diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/domain/RealEstate.java b/cas-system/src/main/java/com/inscloudtech/datacenter/domain/RealEstate.java index a20cd8e..64d9c5a 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/domain/RealEstate.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/domain/RealEstate.java @@ -28,7 +28,6 @@ import java.math.BigDecimal; */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("dc_real_estate") @IndexName(value = "dc_real_estate",refreshPolicy = RefreshPolicy.IMMEDIATE) @ExcelIgnoreUnannotated public class RealEstate extends BaseEntity { diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/domain/dto/export/PlateNumberExportAllDto.java b/cas-system/src/main/java/com/inscloudtech/datacenter/domain/dto/export/PlateNumberInfoExportAllDto.java similarity index 95% rename from cas-system/src/main/java/com/inscloudtech/datacenter/domain/dto/export/PlateNumberExportAllDto.java rename to cas-system/src/main/java/com/inscloudtech/datacenter/domain/dto/export/PlateNumberInfoExportAllDto.java index 4655350..c1088b8 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/domain/dto/export/PlateNumberExportAllDto.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/domain/dto/export/PlateNumberInfoExportAllDto.java @@ -25,7 +25,7 @@ import org.dromara.easyes.annotation.rely.FieldType; @Data @EqualsAndHashCode(callSuper = true) @ExcelIgnoreUnannotated -public class PlateNumberExportAllDto extends ExportBaseEntity { +public class PlateNumberInfoExportAllDto extends ExportBaseEntity { @ExcelProperty("车牌号") private String plateNumber; diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/domain/vo/GetOpeningAccountInfoListReq.java b/cas-system/src/main/java/com/inscloudtech/datacenter/domain/vo/GetOpeningAccountInfoListReq.java index 85f281e..ea20566 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/domain/vo/GetOpeningAccountInfoListReq.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/domain/vo/GetOpeningAccountInfoListReq.java @@ -94,7 +94,7 @@ public class GetOpeningAccountInfoListReq { */ private String caseId; - private Params params = new Params(); + private OaiParams params = new OaiParams(); private BigDecimal beginBalance; private BigDecimal endBalance; @@ -121,7 +121,7 @@ public class GetOpeningAccountInfoListReq { private Integer downloadTemplate; @Data - public static class Params { + public static class OaiParams { private BigDecimal beginTransactionAmount; private BigDecimal endTransactionAmount; private String beginOpenTime; diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/mapper/CarInfoMapper.java b/cas-system/src/main/java/com/inscloudtech/datacenter/mapper/CarInfoMapper.java deleted file mode 100644 index 465306b..0000000 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/mapper/CarInfoMapper.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.inscloudtech.datacenter.mapper; - - -import com.inscloudtech.common.core.mapper.BaseMapperPlus; -import com.inscloudtech.datacenter.domain.CarInfo; -import com.inscloudtech.datacenter.domain.dto.StatisticsOption; -import com.inscloudtech.datacenter.domain.dto.StatisticsResult; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; -import org.apache.ibatis.annotations.Update; - -import java.util.List; -import java.util.Map; - -/** - * 重点人员资产-车辆信息Mapper接口 - * - * @author inscloudtech - * @date 2023-11-10 - */ -public interface CarInfoMapper extends BaseMapperPlus { - - @Select("") - List getFieldsValueCount(@Param("tableName") String tableName, @Param("fields") List fields, @Param("caseId") String caseId); - - - - @Select("SHOW INDEXES FROM #{tableName}") - List getIndexInfo(@Param("tableName") String tableName); - - @Update("update ${tableName} set del_flag = '2' WHERE case_id = ${caseId}") - void updateDelFlag(@Param("tableName") String tableName, @Param("caseId") String caseId); -} diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/mapper/PublicFamilyMapper.java b/cas-system/src/main/java/com/inscloudtech/datacenter/mapper/PublicFamilyMapper.java deleted file mode 100644 index 95d882a..0000000 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/mapper/PublicFamilyMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.inscloudtech.datacenter.mapper; - - -import com.inscloudtech.common.core.mapper.BaseMapperPlus; -import com.inscloudtech.datacenter.domain.PublicFamily; - -/** - * 数据中心-职工家属Mapper接口 - * - * @author inscloudtech - * @date 2023-11-09 - */ -public interface PublicFamilyMapper extends BaseMapperPlus { - -} - diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/mapper/RealEstateMapper.java b/cas-system/src/main/java/com/inscloudtech/datacenter/mapper/RealEstateMapper.java deleted file mode 100644 index b902a1d..0000000 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/mapper/RealEstateMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.inscloudtech.datacenter.mapper; - - -import com.inscloudtech.common.core.mapper.BaseMapperPlus; -import com.inscloudtech.datacenter.domain.RealEstate; - -/** - * 重点人员资产-不动产信息Mapper接口 - * - * @author inscloudtech - * @date 2023-11-09 - */ -public interface RealEstateMapper extends BaseMapperPlus { - -} diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/mapper/TransactionPartnerMapper.java b/cas-system/src/main/java/com/inscloudtech/datacenter/mapper/TransactionPartnerMapper.java deleted file mode 100644 index 4b3cc2e..0000000 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/mapper/TransactionPartnerMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.inscloudtech.datacenter.mapper; - - - -import com.inscloudtech.common.core.mapper.BaseMapperPlus; -import com.inscloudtech.datacenter.domain.TransactionPartner; - - -/** - * 数据中心-交易对象Mapper接口 - * - * @author inscloudtech - * @date 2023-11-07 - */ -public interface TransactionPartnerMapper extends BaseMapperPlus { - -} diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/service/QueryCenterService.java b/cas-system/src/main/java/com/inscloudtech/datacenter/service/QueryCenterService.java index 67c58a5..63a29cb 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/service/QueryCenterService.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/service/QueryCenterService.java @@ -39,7 +39,6 @@ import com.inscloudtech.common.utils.spring.SpringUtils; import com.inscloudtech.datacenter.domain.*; import com.inscloudtech.datacenter.domain.dto.*; import com.inscloudtech.datacenter.domain.vo.GetBankStatementListReq; -import com.inscloudtech.datacenter.mapper.CarInfoMapper; import com.inscloudtech.datacenter.mapper.es.OtherInformationEsMapper; import com.inscloudtech.system.domain.SysOss; import com.inscloudtech.system.mapper.SysOssMapper; @@ -121,8 +120,6 @@ public class QueryCenterService { private final OtherInformationEsMapper commonEsMapper; - private final CarInfoMapper commonMysqlMapper; - private final AnalysisReportMapper analysisReportMapper; private final SysOssMapper ossMapper; @@ -146,7 +143,7 @@ public class QueryCenterService { private final BankService bankService; - private Map>> importMapperMap = new HashMap(); + private Map> importMapperMap = new HashMap(); private Map>> dtoMap = new HashMap(); @@ -608,9 +605,9 @@ public class QueryCenterService { deleteRequest.setRefresh(true); BulkByScrollResponse response = restHighLevelClient.deleteByQuery(deleteRequest, RequestOptions.DEFAULT); long deletedCount = response.getDeleted(); - if(!unNeedDeleteMysql.contains(index) && StrUtil.isNotEmpty(query.getCaseId())){ + /* if(!unNeedDeleteMysql.contains(index) && StrUtil.isNotEmpty(query.getCaseId())){ this.deleteMysqlData(index,query.getCaseId()); - } + }*/ if(index.equals("dc_other_information")){ sysOssService.deleteByCaseIdAndBusinessModule(query.getCaseId(),"OTHER_INFORMATION"); @@ -621,11 +618,6 @@ public class QueryCenterService { return deletedCount; } - void deleteMysqlData(String indexName,String caseId){ - commonMysqlMapper.updateDelFlag(indexName,caseId); - } - - /** * 测试用 */ @@ -675,23 +667,6 @@ public class QueryCenterService { return true; } - public JSONObject getFieldsValueCount2Mysql(StatisticsQuery query) { - List fields = query.getFields(); - List groupByFields = new ArrayList<>(); - for (String field : fields) { - groupByFields.add(StrUtil.toUnderlineCase(field)); - } - String module = query.getModule(); - List list = commonMysqlMapper.getFieldsValueCount(module, groupByFields, query.getCaseId()); - Map> listMap = - list.stream().collect(Collectors.groupingBy(StatisticsOption::getField)); - JSONObject resJson = new JSONObject(); - for (String field : listMap.keySet()) { - resJson.put(StrUtil.toCamelCase(field), listMap.get(field)); - } - return resJson; - } - @SneakyThrows public JSONObject getData4Report(List> willSearch, String name, String idCard, String caseId) { JSONObject queryInfo = getQueryInfo(willSearch); @@ -1121,7 +1096,7 @@ public class QueryCenterService { filePath = localUploadPath + filePath; this.saveFilesFromZipToLocal(filePath,zipEntry,zis,buffer); }else {//解析excel数据存入 mysql或es - this.uploadDataToMysqlOrEs(filePath,zipEntry,zis,buffer); + this.uploadDataToEs(filePath,zipEntry,zis,buffer); } // 关闭当前条目 zis.closeEntry(); @@ -1144,28 +1119,27 @@ public class QueryCenterService { } - private void uploadDataToMysqlOrEs(String zipEntryName,ZipEntry zipEntry,ZipInputStream zis,byte[] buffer) throws NoSuchMethodException { - String objName = zipEntryName.replace(".xlsx",""); - List> objList = dtoMap.get(objName); - Class targetType = objList.get(0); - List dataList = zipInputStream2List(zipEntry, zis, buffer, targetType); - if(objList.size() > 1){ - dataList = BeanUtil.copyToList(dataList, objList.get(1)); - } - if(objName.equals("BankStatement")){//流水数据太大需要份 batchSize导入 - this.batchInsertBs((List)dataList); - }else{ - List> mapperClassList = importMapperMap.get(objName); - for (Class mapperClass : mapperClassList) { + private void uploadDataToEs(String zipEntryName,ZipEntry zipEntry,ZipInputStream zis,byte[] buffer) throws NoSuchMethodException { + try { + String objName = zipEntryName.replace(".xlsx",""); + List> objList = dtoMap.get(objName); + Class targetType = objList.get(0); + List dataList = zipInputStream2List(zipEntry, zis, buffer, targetType); + if(objList.size() > 1){ + dataList = BeanUtil.copyToList(dataList, objList.get(1)); + } + if(objName.equals("BankStatement")){//流水数据太大需要份 batchSize导入 + this.batchInsertBs((List)dataList); + }else{ + Class mapperClass = importMapperMap.get(objName); Object mapperObj = SpringUtils.getBean(mapperClass); Method insertBatch = mapperClass.getMethod("insertBatch", Collection.class); - try { - insertBatch.invoke(mapperObj, dataList); - }catch (Exception e){ - e.printStackTrace(); - } + insertBatch.invoke(mapperObj, dataList); } + }catch (Exception e){ + e.printStackTrace(); } + } @SneakyThrows @@ -1218,21 +1192,18 @@ public class QueryCenterService { } Class esMapperClass = collect.get(simpleName); simpleName = simpleName.replace("EsMapper",""); - if(collect.containsKey(simpleName + "Mapper")){ - Class mysqlMapperClass = collect.get(simpleName + "Mapper"); - importMapperMap.put(simpleName, Arrays.asList(esMapperClass,mysqlMapperClass)); - } + importMapperMap.put(simpleName, esMapperClass); } - importMapperMap.put("OpeningAccountInfo",Arrays.asList(ESOpeningAccountInfoMapper.class)); + importMapperMap.put("OpeningAccountInfo",ESOpeningAccountInfoMapper.class); - importMapperMap.put("SysLawCase",Arrays.asList(SysLawCaseMapper.class)); + importMapperMap.put("SysLawCase",SysLawCaseMapper.class); - importMapperMap.put("AnalysisReport",Arrays.asList(AnalysisReportMapper.class)); + importMapperMap.put("AnalysisReport",AnalysisReportMapper.class); - importMapperMap.put("AnalysisResult",Arrays.asList(AnalysisReportMapper.class)); + importMapperMap.put("AnalysisResult",AnalysisReportMapper.class); - importMapperMap.put("SysOss",Arrays.asList(SysOssMapper.class)); + importMapperMap.put("SysOss",SysOssMapper.class); } diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/BankServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/BankServiceImpl.java index f5d58cb..3b114b7 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/BankServiceImpl.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/BankServiceImpl.java @@ -671,7 +671,7 @@ public class BankServiceImpl implements BankService { Map buildOAISearchSourceBuilder(GetOpeningAccountInfoListReq req){ - GetOpeningAccountInfoListReq.Params params = req.getParams(); + GetOpeningAccountInfoListReq.OaiParams params = req.getParams(); BigDecimal beginBalance = params.getBeginBalance(); if (beginBalance != null) { diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CarInfoServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CarInfoServiceImpl.java index 201d00b..bd4adc2 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CarInfoServiceImpl.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CarInfoServiceImpl.java @@ -1,21 +1,16 @@ package com.inscloudtech.datacenter.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.inscloudtech.analysiscenter.domain.AnalysisDto; -import com.inscloudtech.analysiscenter.domain.AnalysisReport; import com.inscloudtech.common.annotation.UpdateLog; import com.inscloudtech.common.core.domain.PageQuery; import com.inscloudtech.common.core.page.TableDataInfo; import com.inscloudtech.common.utils.StringUtils; import com.inscloudtech.common.utils.bean.BeanUtils; -import com.inscloudtech.datacenter.domain.*; import com.inscloudtech.datacenter.domain.CarInfo; -import com.inscloudtech.datacenter.domain.CarInfo; -import com.inscloudtech.datacenter.mapper.CarInfoMapper; import com.inscloudtech.datacenter.mapper.es.CarInfoEsMapper; import com.inscloudtech.datacenter.service.ICarInfoService; import com.inscloudtech.bankStatementAnalysis.helper.HelperUtil; @@ -24,8 +19,6 @@ import lombok.RequiredArgsConstructor; import org.dromara.easyes.core.biz.SAPageInfo; import org.dromara.easyes.core.conditions.select.LambdaEsQueryWrapper; import org.dromara.easyes.core.core.EsWrappers; -import org.elasticsearch.index.query.BoolQueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.springframework.aop.framework.AopContext; import org.springframework.stereotype.Service; @@ -45,8 +38,6 @@ import java.util.stream.Collectors; @Service public class CarInfoServiceImpl implements ICarInfoService { - private final CarInfoMapper baseMapper; - private final CarInfoEsMapper esMapper; private final PlateNumberService plateNumberService; @@ -54,7 +45,7 @@ public class CarInfoServiceImpl implements ICarInfoService { @Override public void analysisResultMerge(Map sourceArIdTargetArIdMap) { - List analysisReportList = baseMapper.selectList(new LambdaQueryWrapper() + List analysisReportList = esMapper.selectList(new LambdaEsQueryWrapper() .in(CarInfo::getAnalysisResultId,sourceArIdTargetArIdMap.keySet())); Map> arMap = analysisReportList.stream().collect(Collectors.groupingBy(CarInfo::getAnalysisResultId)); List addList = new ArrayList<>(); @@ -71,7 +62,7 @@ public class CarInfoServiceImpl implements ICarInfoService { } } if(CollectionUtil.isNotEmpty(addList)){ - baseMapper.insertBatch(addList); + esMapper.insertBatch(addList); } } @@ -214,7 +205,6 @@ public class CarInfoServiceImpl implements ICarInfoService { @Override @Transactional public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { -// baseMapper.deleteBatchIds(ids); esMapper.deleteBatchIds(ids); return true; } @@ -303,7 +293,7 @@ public class CarInfoServiceImpl implements ICarInfoService { return true; } - @UpdateLog(title = "车辆信息",mapperClass = CarInfoMapper.class) + @UpdateLog(title = "车辆信息",mapperClass = CarInfoEsMapper.class) public boolean updateR(CarInfo bo) { return updateByBo(bo); } diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CollectionInformationServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CollectionInformationServiceImpl.java index a543e71..545facc 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CollectionInformationServiceImpl.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CollectionInformationServiceImpl.java @@ -8,25 +8,17 @@ import com.inscloudtech.bankStatementAnalysis.helper.HelperUtil; import com.inscloudtech.common.annotation.UpdateLog; import com.inscloudtech.common.core.domain.PageQuery; import com.inscloudtech.common.core.page.TableDataInfo; -import com.inscloudtech.common.utils.BeanCopyUtils; import com.inscloudtech.common.utils.StringUtils; import com.inscloudtech.common.utils.bean.BeanUtils; -import com.inscloudtech.datacenter.domain.CarInfo; import com.inscloudtech.datacenter.domain.CollectionInformation; -import com.inscloudtech.datacenter.domain.OtherAssets; -import com.inscloudtech.datacenter.mapper.CarInfoMapper; -import com.inscloudtech.datacenter.mapper.es.CarInfoEsMapper; import com.inscloudtech.datacenter.mapper.es.CollectionInformationEsMapper; -import com.inscloudtech.datacenter.mapper.es.PlateNumberEsMapper; import com.inscloudtech.datacenter.service.CollectionInformationService; -import com.inscloudtech.datacenter.service.PlateNumberService; import lombok.RequiredArgsConstructor; import org.dromara.easyes.core.biz.SAPageInfo; import org.dromara.easyes.core.conditions.select.LambdaEsQueryWrapper; import org.dromara.easyes.core.core.EsWrappers; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.springframework.aop.framework.AopContext; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -273,7 +265,7 @@ public class CollectionInformationServiceImpl implements CollectionInformationSe return true; } - @UpdateLog(title = "日常收集信息",mapperClass = CarInfoMapper.class) + @UpdateLog(title = "日常收集信息",mapperClass = CollectionInformationEsMapper.class) public boolean updateR(CollectionInformation update) { return esMapper.updateById(update) > 0; } diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/PlateNumberServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/PlateNumberServiceImpl.java index 0c40ba5..0b24e8c 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/PlateNumberServiceImpl.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/PlateNumberServiceImpl.java @@ -1,25 +1,19 @@ package com.inscloudtech.datacenter.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.inscloudtech.analysiscenter.domain.AnalysisDto; import com.inscloudtech.common.annotation.UpdateLog; import com.inscloudtech.common.core.domain.PageQuery; import com.inscloudtech.common.core.page.TableDataInfo; -import com.inscloudtech.common.utils.BeanCopyUtils; import com.inscloudtech.common.utils.StringUtils; import com.inscloudtech.common.utils.bean.BeanUtils; import com.inscloudtech.datacenter.domain.CarInfo; import com.inscloudtech.datacenter.domain.PlateNumberInfo; -import com.inscloudtech.datacenter.domain.RealEstate; -import com.inscloudtech.datacenter.mapper.CarInfoMapper; import com.inscloudtech.datacenter.mapper.es.CarInfoEsMapper; import com.inscloudtech.datacenter.mapper.es.PlateNumberEsMapper; -import com.inscloudtech.datacenter.service.ICarInfoService; import com.inscloudtech.datacenter.service.PlateNumberService; import com.inscloudtech.bankStatementAnalysis.helper.HelperUtil; import lombok.RequiredArgsConstructor; @@ -440,7 +434,7 @@ public class PlateNumberServiceImpl implements PlateNumberService { return true; } - @UpdateLog(title = "车辆抓取",mapperClass = CarInfoMapper.class) + @UpdateLog(title = "车辆抓取",mapperClass = PlateNumberEsMapper.class) public boolean updateR(PlateNumberInfo update) { return esMapper.updateById(update) > 0; } diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/PublicFamilyServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/PublicFamilyServiceImpl.java index dd8cb79..f43a41b 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/PublicFamilyServiceImpl.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/PublicFamilyServiceImpl.java @@ -4,43 +4,28 @@ package com.inscloudtech.datacenter.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.inscloudtech.analysiscenter.domain.AnalysisDto; import com.inscloudtech.bankStatementAnalysis.helper.HelperUtil; -import com.inscloudtech.common.annotation.DeduplicationField; -import com.inscloudtech.common.annotation.NameField; import com.inscloudtech.common.annotation.UpdateLog; import com.inscloudtech.common.core.domain.PageQuery; import com.inscloudtech.common.core.page.TableDataInfo; import com.inscloudtech.common.utils.StringUtils; import com.inscloudtech.common.utils.bean.BeanUtils; -import com.inscloudtech.datacenter.domain.*; import com.inscloudtech.datacenter.domain.PublicFamily; -import com.inscloudtech.datacenter.mapper.PublicFamilyMapper; import com.inscloudtech.datacenter.mapper.es.PublicFamilyEsMapper; import com.inscloudtech.datacenter.service.IPublicFamilyService; import com.inscloudtech.datacenter.service.QueryCenterService; -import com.inscloudtech.datacenter.domain.BankStatement; import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; -import org.dromara.easyes.annotation.HighLight; -import org.dromara.easyes.annotation.IndexId; import org.dromara.easyes.core.biz.SAPageInfo; import org.dromara.easyes.core.conditions.select.LambdaEsQueryWrapper; import org.dromara.easyes.core.core.EsWrappers; -import org.elasticsearch.index.query.BoolQueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.springframework.aop.framework.AopContext; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.math.BigDecimal; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -55,13 +40,13 @@ import java.util.stream.Collectors; @Service public class PublicFamilyServiceImpl implements IPublicFamilyService { - private final PublicFamilyMapper baseMapper; + private final PublicFamilyEsMapper esMapper; @Override public void analysisResultMerge(Map sourceArIdTargetArIdMap) { - List analysisReportList = baseMapper.selectList(new LambdaQueryWrapper() + List analysisReportList = esMapper.selectList(new LambdaEsQueryWrapper() .in(PublicFamily::getAnalysisResultId,sourceArIdTargetArIdMap.keySet())); Map> arMap = analysisReportList.stream().collect(Collectors.groupingBy(PublicFamily::getAnalysisResultId)); List addList = new ArrayList<>(); @@ -77,7 +62,7 @@ public class PublicFamilyServiceImpl implements IPublicFamilyService { } } if(CollectionUtil.isNotEmpty(addList)){ - baseMapper.insertBatch(addList); + esMapper.insertBatch(addList); } } @@ -211,13 +196,10 @@ public class PublicFamilyServiceImpl implements IPublicFamilyService { */ @Override public Boolean insertByBo(PublicFamily bo) { - PublicFamily add = BeanUtil.toBean(bo, PublicFamily.class); - boolean flag = baseMapper.insert(add) > 0; - if (flag) { - bo.setId(add.getId()); - esMapper.insert(add); - } - return flag; + String md5Id = HelperUtil.generateMD5(bo.toString()); + bo.setId(md5Id); + esMapper.insert(bo); + return true; } /** @@ -226,12 +208,8 @@ public class PublicFamilyServiceImpl implements IPublicFamilyService { @Override @Transactional public Boolean updateByBo(PublicFamily bo) { - PublicFamily update = BeanUtil.toBean(bo, PublicFamily.class); - boolean b = baseMapper.updateById(update) > 0; - if(b){ - esMapper.updateById(update); - } - return b; + esMapper.updateById(bo); + return true; } /** @@ -240,7 +218,6 @@ public class PublicFamilyServiceImpl implements IPublicFamilyService { @Override @Transactional public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - baseMapper.deleteBatchIds(ids); esMapper.deleteBatchIds(ids); return true; } @@ -319,12 +296,9 @@ public class PublicFamilyServiceImpl implements IPublicFamilyService { return true; } - @UpdateLog(title = "职工家属",mapperClass = PublicFamilyMapper.class) + @UpdateLog(title = "职工家属",mapperClass = PublicFamilyEsMapper.class) public boolean updateR(PublicFamily update) { -// boolean b = baseMapper.updateById(update) > 0; -// if(b){ boolean b = esMapper.updateById(update) >0; -// } return b; } diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/RealEstateServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/RealEstateServiceImpl.java index f68bcee..227c0bd 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/RealEstateServiceImpl.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/RealEstateServiceImpl.java @@ -9,10 +9,7 @@ import com.inscloudtech.common.core.domain.PageQuery; import com.inscloudtech.common.core.page.TableDataInfo; import com.inscloudtech.common.utils.StringUtils; import com.inscloudtech.common.utils.bean.BeanUtils; -import com.inscloudtech.datacenter.domain.*; import com.inscloudtech.datacenter.domain.RealEstate; -import com.inscloudtech.datacenter.domain.RealEstate; -import com.inscloudtech.datacenter.mapper.RealEstateMapper; import com.inscloudtech.datacenter.mapper.es.RealEstateEsMapper; import com.inscloudtech.datacenter.service.IRealEstateService; import com.inscloudtech.bankStatementAnalysis.helper.HelperUtil; @@ -20,8 +17,6 @@ import lombok.RequiredArgsConstructor; import org.dromara.easyes.core.biz.SAPageInfo; import org.dromara.easyes.core.conditions.select.LambdaEsQueryWrapper; import org.dromara.easyes.core.core.EsWrappers; -import org.elasticsearch.index.query.BoolQueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.springframework.aop.framework.AopContext; import org.springframework.stereotype.Service; @@ -41,13 +36,12 @@ import java.util.stream.Collectors; @Service public class RealEstateServiceImpl implements IRealEstateService { - private final RealEstateMapper baseMapper; private final RealEstateEsMapper esMapper; @Override public void analysisResultMerge(Map sourceArIdTargetArIdMap) { - List analysisReportList = baseMapper.selectList(new LambdaQueryWrapper() + List analysisReportList = esMapper.selectList(new LambdaEsQueryWrapper() .in(RealEstate::getAnalysisResultId,sourceArIdTargetArIdMap.keySet())); Map> arMap = analysisReportList.stream().collect(Collectors.groupingBy(RealEstate::getAnalysisResultId)); List addList = new ArrayList<>(); @@ -63,7 +57,7 @@ public class RealEstateServiceImpl implements IRealEstateService { } } if(CollectionUtil.isNotEmpty(addList)){ - baseMapper.insertBatch(addList); + esMapper.insertBatch(addList); } } @@ -207,12 +201,12 @@ public class RealEstateServiceImpl implements IRealEstateService { * 新增重点人员资产-不动产信息 */ @Override - public Boolean insertByBo(RealEstate bo) { - boolean flag = baseMapper.insert(bo) > 0; - if (flag) { - esMapper.insert(bo); - } - return flag; + public Boolean insertByBo(RealEstate add) { + String uniqueKey = BeanUtils.getUniqueKey(add); + String md5Id = HelperUtil.generateMD5(uniqueKey); + add.setId(md5Id); + esMapper.insert(add); + return true; } /** @@ -220,10 +214,7 @@ public class RealEstateServiceImpl implements IRealEstateService { */ @Override public Boolean updateByBo(RealEstate bo) { - boolean b = baseMapper.updateById(bo) > 0; - if(b){ - esMapper.updateById(bo); - } + boolean b = esMapper.updateById(bo) > 0; return b; } @@ -233,7 +224,6 @@ public class RealEstateServiceImpl implements IRealEstateService { */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - baseMapper.deleteBatchIds(ids); esMapper.deleteBatchIds(ids); return true; } diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/TransactionPartnerServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/TransactionPartnerServiceImpl.java index 0fae8ec..02c1936 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/TransactionPartnerServiceImpl.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/TransactionPartnerServiceImpl.java @@ -10,7 +10,6 @@ import com.inscloudtech.common.core.domain.PageQuery; import com.inscloudtech.common.core.page.TableDataInfo; import com.inscloudtech.common.utils.bean.BeanUtils; import com.inscloudtech.datacenter.domain.TransactionPartner; -import com.inscloudtech.datacenter.mapper.TransactionPartnerMapper; import com.inscloudtech.datacenter.mapper.es.TransactionPartnerEsMapper; import com.inscloudtech.datacenter.service.ITransactionPartnerService; import com.inscloudtech.datacenter.service.QueryCenterService; @@ -39,13 +38,11 @@ import java.util.stream.Stream; @Service public class TransactionPartnerServiceImpl implements ITransactionPartnerService { - private final TransactionPartnerMapper baseMapper; - private final TransactionPartnerEsMapper esMapper; @Override public void analysisResultMerge(Map sourceArIdTargetArIdMap) { - List analysisReportList = baseMapper.selectList(new LambdaQueryWrapper() + List analysisReportList = esMapper.selectList(new LambdaEsQueryWrapper() .in(TransactionPartner::getAnalysisResultId,sourceArIdTargetArIdMap.keySet())); Map> arMap = analysisReportList.stream().collect(Collectors.groupingBy(TransactionPartner::getAnalysisResultId)); List addList = new ArrayList<>(); @@ -61,7 +58,7 @@ public class TransactionPartnerServiceImpl implements ITransactionPartnerService } } if(CollectionUtil.isNotEmpty(addList)){ - baseMapper.insertBatch(addList); + esMapper.insertBatch(addList); } } @@ -213,25 +210,21 @@ public class TransactionPartnerServiceImpl implements ITransactionPartnerService @Override public Boolean insert(TransactionPartner add) { - boolean b = baseMapper.insert(add) > 0; - if (b) { - esMapper.insert(add); - } - return b; + String uniqueKey = BeanUtils.getUniqueKey(add); + String md5Id = HelperUtil.generateMD5(uniqueKey); + add.setId(md5Id); + esMapper.insert(add); + return true; } @Override public Boolean update(TransactionPartner update) { - boolean b = baseMapper.updateById(update) > 0; - if (b) { - esMapper.updateById(update); - } - return b; + esMapper.updateById(update); + return true; } @Override public Boolean deleteWithValidByIds(Collection ids) { - baseMapper.deleteBatchIds(ids); esMapper.deleteBatchIds(ids); return true; } @@ -353,9 +346,9 @@ public class TransactionPartnerServiceImpl implements ITransactionPartnerService return result; } - @UpdateLog(title = "交易对象",mapperClass = TransactionPartnerMapper.class) + @UpdateLog(title = "交易对象",mapperClass = TransactionPartnerEsMapper.class) public boolean updateR(TransactionPartner update) { - boolean b = baseMapper.updateById(update) > 0; + boolean b = esMapper.updateById(update) > 0; return b; }