From d2a2ab67aef9d147daeca4a440c314e967827cce Mon Sep 17 00:00:00 2001 From: "583641232@qq.com" <583641232@qq.com> Date: Tue, 30 Jul 2024 14:24:21 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=204=E6=A8=A1=E5=9D=97=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC=EF=BC=8C=E5=A4=9A=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E8=A1=A8=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AnalysisResultController.java | 5 +- .../PlateNumberInfoController.java | 3 +- .../datacenter/CarInfoController.java | 5 +- .../datacenter/PublicFamilyController.java | 7 +- .../datacenter/RealEstateController.java | 1 + .../index/InvestigatorTaskController.java | 115 +++++++++++++ cas-common/pom.xml | 5 +- .../common/excel/DefaultExcelListener.java | 1 - .../common/excel/ImportExcelHelper.java | 15 +- .../common/excel/ImportExcelListener.java | 3 +- .../framework/aspectj/UpdateRecordAspect.java | 4 + cas-system/pom.xml | 5 - .../service/impl/ImportServiceImpl.java | 3 +- .../caseMange/domain/vo/AddRemarkReq.java | 10 ++ .../datacenter/domain/CarInfo.java | 6 + .../datacenter/domain/PublicFamily.java | 152 +++++++++--------- .../datacenter/domain/RealEstate.java | 4 +- .../datacenter/domain/TransactionPartner.java | 6 + .../service/impl/RealEstateServiceImpl.java | 9 +- 19 files changed, 256 insertions(+), 103 deletions(-) create mode 100644 cas-admin/src/main/java/com/inscloudtech/web/controller/index/InvestigatorTaskController.java create mode 100644 cas-system/src/main/java/com/inscloudtech/caseMange/domain/vo/AddRemarkReq.java diff --git a/cas-admin/src/main/java/com/inscloudtech/web/controller/analysiscenter/AnalysisResultController.java b/cas-admin/src/main/java/com/inscloudtech/web/controller/analysiscenter/AnalysisResultController.java index 63e6989..c48f8e9 100644 --- a/cas-admin/src/main/java/com/inscloudtech/web/controller/analysiscenter/AnalysisResultController.java +++ b/cas-admin/src/main/java/com/inscloudtech/web/controller/analysiscenter/AnalysisResultController.java @@ -61,7 +61,7 @@ public class AnalysisResultController extends BaseController { bo.setCreateBy(getUsername()); bo.setCreateTime(new Date()); iAnalysisResultService.insert(bo); - return R.ok(bo.getId()); + return R.ok(); } @@ -77,7 +77,8 @@ public class AnalysisResultController extends BaseController { @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable String[] ids) { - return R.ok(iAnalysisResultService.deleteWithValidByIds(Arrays.asList(ids))); + iAnalysisResultService.deleteWithValidByIds(Arrays.asList(ids)); + return R.ok(); } diff --git a/cas-admin/src/main/java/com/inscloudtech/web/controller/analysiscenter/PlateNumberInfoController.java b/cas-admin/src/main/java/com/inscloudtech/web/controller/analysiscenter/PlateNumberInfoController.java index 04dd8b5..51cf83e 100644 --- a/cas-admin/src/main/java/com/inscloudtech/web/controller/analysiscenter/PlateNumberInfoController.java +++ b/cas-admin/src/main/java/com/inscloudtech/web/controller/analysiscenter/PlateNumberInfoController.java @@ -77,7 +77,8 @@ public class PlateNumberInfoController extends BaseController { @PostMapping() public R add( @RequestBody PlateNumberInfo bo) { bo.setCreateBy(getUsername()); - return R.ok(iPlateNumberInfoService.insertByBo(bo)); + iPlateNumberInfoService.insertByBo(bo); + return R.ok(); } /** 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 3ea6e06..3f157db 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 @@ -77,8 +77,9 @@ public class CarInfoController extends BaseController { //"新增车辆信息") @Log(title = "重点人员资产-车辆信息", businessType = BusinessType.INSERT) @PostMapping() - public R add( @RequestBody CarInfo bo) { - return R.ok(iCarInfoService.insertByBo(bo)); + public R add(@RequestBody CarInfo bo) { + iCarInfoService.insertByBo(bo); + return R.ok(); } /** 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 d4cb482..2071b05 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 @@ -146,10 +146,11 @@ public class PublicFamilyController extends BaseController { String importResultStr = ""; int importCount = 0; try { - List list = importService.importMergeExcel(file, PublicFamily.class,"企业名字"); - // ExcelResult excelResult = ExcelUtil.importExcel(file.getInputStream(), PublicFamily.class, true); -// List list = excelResult.getList(); +// List ddd = excelResult.getList(); + List list = importService.importMergeExcel(file, PublicFamily.class,"单位名称"); + + if(CollectionUtil.isNotEmpty(list)){ list = iPublicFamilyService.dataTrimAndDeduplication(list,caseId,getUsername()); result = iPublicFamilyService.importData(list,caseId,null); 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 3b8949f..2a5232b 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 @@ -95,6 +95,7 @@ public class RealEstateController extends BaseController { throw new RuntimeException("未解析到数据！"); } }catch (Exception e){ + e.printStackTrace(); importResultStr = e.getMessage(); } iSysOssService.upload2Local(importCount,importResultStr,file,caseId,"REAL_ESTATE"); diff --git a/cas-admin/src/main/java/com/inscloudtech/web/controller/index/InvestigatorTaskController.java b/cas-admin/src/main/java/com/inscloudtech/web/controller/index/InvestigatorTaskController.java new file mode 100644 index 0000000..e392dde --- /dev/null +++ b/cas-admin/src/main/java/com/inscloudtech/web/controller/index/InvestigatorTaskController.java @@ -0,0 +1,115 @@ +package com.inscloudtech.web.controller.index; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.inscloudtech.caseMange.domain.SysLawCase; +import com.inscloudtech.caseMange.domain.vo.AddRemarkReq; +import com.inscloudtech.caseMange.domain.vo.LawCaseListReq; +import com.inscloudtech.caseMange.domain.vo.LawCaseResp; +import com.inscloudtech.caseMange.mapper.SysLawCaseMapper; +import com.inscloudtech.caseMange.service.IInvestigatorTaskService; +import com.inscloudtech.caseMange.service.ISysLawCaseService; +import com.inscloudtech.common.annotation.Log; +import com.inscloudtech.common.annotation.UpdateLog; +import com.inscloudtech.common.core.domain.R; +import com.inscloudtech.common.core.domain.entity.SysUser; +import com.inscloudtech.common.core.page.TableDataInfo; +import com.inscloudtech.common.enums.BusinessType; + + +import com.inscloudtech.system.mapper.SysUserMapper; +import lombok.RequiredArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +//("调查人员页面") +@RequiredArgsConstructor +@RestController +@RequestMapping("/worker/task") +public class InvestigatorTaskController { + + private final IInvestigatorTaskService taskService; + private final ISysLawCaseService lawCaseService; + private final SysUserMapper userMapper; + + private final Logger log = LoggerFactory.getLogger(InvestigatorTaskController.class); + + //Operation("添加备注") + @PostMapping("/addRemark") + @UpdateLog(title = "调查人员登录", businessType = BusinessType.UPDATE, mapperClass = SysLawCaseMapper.class, methodName = "selectById") + public R addRemark(@RequestBody AddRemarkReq req) { + try { + taskService.addRemark(req.getLawCaseId(), req.getRemark()); + return R.ok(); + } catch (Exception ex) { + return R.fail(ex.getMessage()); + } + } + + /** + * 案件列表-调查人员登录首页 + */ + //Operation("案件列表") + @PostMapping("/lawCaseList") + @Log(title = "调查人员登录", businessType = BusinessType.UPDATE) + public TableDataInfo lawCaseList(@RequestBody LawCaseListReq req) { + + TableDataInfo page = lawCaseService.getLawCaseList(req); + + List records = new ArrayList<>(); + + for (SysLawCase lawCase : page.getRows()) { + LawCaseResp resp = new LawCaseResp(); + + String caseId = lawCase.getId(); + + resp.setId(caseId); + resp.setName(lawCase.getName()); + resp.setCreateTime(lawCase.getCreateTime()); + resp.setRemark(lawCase.getRemark()); + + // 根据案件Id，查询关联的调查人员 + String investigators = lawCase.getInvestigatorStr(); + if(StrUtil.isNotEmpty(investigators)){ + List idNoList; + if(investigators.contains(",")){ + idNoList = Arrays.asList(investigators.split(",")); + }else { + idNoList = Collections.singletonList(investigators); + } + if(CollectionUtil.isNotEmpty(idNoList)){ + LambdaQueryWrapper userLqw = Wrappers.lambdaQuery(); + userLqw.in(SysUser::getIdCardNo, idNoList); + List sysUsers = userMapper.selectList(userLqw); + // 根据案件Id，查询关联的调查人员 + List investigatorNames = new ArrayList<>(); + List investigatorIds = new ArrayList<>(); + for (SysUser user : sysUsers) { + investigatorNames.add(user.getUserName()); + investigatorIds.add(user.getUserId()); + } + resp.setInvestigators(String.join("、", investigatorNames)); + resp.setIds(investigatorIds); + } + } + + // 添加 + records.add(resp); + } + TableDataInfo tableDataInfo = new TableDataInfo(); + tableDataInfo.setRows(records); + tableDataInfo.setTotal(page.getTotal()); + return tableDataInfo; + } +} diff --git a/cas-common/pom.xml b/cas-common/pom.xml index 0d0500b..8d3598f 100644 --- a/cas-common/pom.xml +++ b/cas-common/pom.xml @@ -223,7 +223,10 @@ easy-es-annotation - + + org.dromara.easy-es + easy-es-boot-starter + diff --git a/cas-common/src/main/java/com/inscloudtech/common/excel/DefaultExcelListener.java b/cas-common/src/main/java/com/inscloudtech/common/excel/DefaultExcelListener.java index 5eb8ad7..8ad8523 100644 --- a/cas-common/src/main/java/com/inscloudtech/common/excel/DefaultExcelListener.java +++ b/cas-common/src/main/java/com/inscloudtech/common/excel/DefaultExcelListener.java @@ -19,7 +19,6 @@ import java.util.Set; /** * Excel 导入监听 * - * @author Yjoioooo * @author inscloudtech */ @Slf4j diff --git a/cas-common/src/main/java/com/inscloudtech/common/excel/ImportExcelHelper.java b/cas-common/src/main/java/com/inscloudtech/common/excel/ImportExcelHelper.java index 42f3fea..4d6882e 100644 --- a/cas-common/src/main/java/com/inscloudtech/common/excel/ImportExcelHelper.java +++ b/cas-common/src/main/java/com/inscloudtech/common/excel/ImportExcelHelper.java @@ -5,10 +5,13 @@ import com.alibaba.excel.EasyExcel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.enums.CellExtraTypeEnum; import com.alibaba.excel.metadata.CellExtra; +import com.inscloudtech.common.utils.poi.ExcelUtil; +import lombok.SneakyThrows; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.util.CollectionUtils; +import java.io.FileInputStream; import java.io.InputStream; import java.lang.reflect.Field; import java.util.List; @@ -31,16 +34,16 @@ public class ImportExcelHelper { * @param: headRowNumber 正文起始行 * @return java.util.List 解析后的List */ + @SneakyThrows public List getList(String fileName, Class clazz, Integer sheetNo, Integer headRowNumber) { + ImportExcelListener listener = new ImportExcelListener<>(headRowNumber); - try { - EasyExcel.read(fileName, clazz, listener).extraRead(CellExtraTypeEnum.MERGE).sheet(sheetNo).headRowNumber(headRowNumber).doRead(); - } catch (Exception e) { - LOGGER.error(e.getMessage()); - } + EasyExcel.read(new FileInputStream(fileName), clazz, listener).extraRead(CellExtraTypeEnum.MERGE).sheet(sheetNo).headRowNumber(headRowNumber).doRead(); List extraMergeInfoList = listener.getExtraMergeInfoList(); + if (CollectionUtils.isEmpty(extraMergeInfoList)) { - return listener.getData(); + ExcelResult excelResult = ExcelUtil.importExcel(new FileInputStream(fileName), clazz, true); + return excelResult.getList(); } List data = explainMergeData(listener.getData(), extraMergeInfoList, headRowNumber); return data; diff --git a/cas-common/src/main/java/com/inscloudtech/common/excel/ImportExcelListener.java b/cas-common/src/main/java/com/inscloudtech/common/excel/ImportExcelListener.java index 7699656..253c14c 100644 --- a/cas-common/src/main/java/com/inscloudtech/common/excel/ImportExcelListener.java +++ b/cas-common/src/main/java/com/inscloudtech/common/excel/ImportExcelListener.java @@ -101,7 +101,8 @@ public class ImportExcelListener extends AnalysisEventListener { "额外信息是合并单元格,而且覆盖了一个区间,在firstRowIndex:{},firstColumnIndex;{},lastRowIndex:{},lastColumnIndex:{}", extra.getFirstRowIndex(), extra.getFirstColumnIndex(), extra.getLastRowIndex(), extra.getLastColumnIndex()); - if (extra.getRowIndex() >= headRowNumber) { + //列合并的先不处理 + if (extra.getRowIndex() >= headRowNumber && extra.getLastColumnIndex() == 0) { extraMergeInfoList.add(extra); } break; diff --git a/cas-framework/src/main/java/com/inscloudtech/framework/aspectj/UpdateRecordAspect.java b/cas-framework/src/main/java/com/inscloudtech/framework/aspectj/UpdateRecordAspect.java index a4ed477..a9f27df 100644 --- a/cas-framework/src/main/java/com/inscloudtech/framework/aspectj/UpdateRecordAspect.java +++ b/cas-framework/src/main/java/com/inscloudtech/framework/aspectj/UpdateRecordAspect.java @@ -20,6 +20,7 @@ import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; +import org.dromara.easyes.core.core.BaseEsMapper; import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; @@ -57,6 +58,9 @@ public class UpdateRecordAspect { //service,mapper对应的实体类 Class entityClass = null; boolean isMapperClass = BaseMapper.class.isAssignableFrom(clazz); + if(!isMapperClass){ + isMapperClass = BaseEsMapper.class.isAssignableFrom(clazz); + } //不是service类 if(isMapperClass){ //获取Mapper对应的entity diff --git a/cas-system/pom.xml b/cas-system/pom.xml index 7d6cd00..424fdc1 100644 --- a/cas-system/pom.xml +++ b/cas-system/pom.xml @@ -23,11 +23,6 @@ cas-common - - org.dromara.easy-es - easy-es-boot-starter - - com.aspose aspose-pdf diff --git a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/service/impl/ImportServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/service/impl/ImportServiceImpl.java index 37ddbf9..aee6e16 100644 --- a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/service/impl/ImportServiceImpl.java +++ b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/service/impl/ImportServiceImpl.java @@ -43,6 +43,7 @@ import org.dromara.easyes.core.core.EsWrappers; import org.springframework.stereotype.Service; import java.io.File; +import java.io.FileInputStream; import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; @@ -399,7 +400,7 @@ public class ImportServiceImpl implements ImportService { Cell flagCell = AsposeUtil.getCell(cells, headFieldValue); Integer headRowNumber = flagCell.getRow() + 1; ImportExcelHelper helper = new ImportExcelHelper<>(); - List tempList = helper.getListWithInputStream(file.getInputStream(), clazz, sheetNo, headRowNumber); + List tempList = helper.getList(tempFile.getAbsolutePath(), clazz, sheetNo, headRowNumber); list.addAll(tempList); } return list; diff --git a/cas-system/src/main/java/com/inscloudtech/caseMange/domain/vo/AddRemarkReq.java b/cas-system/src/main/java/com/inscloudtech/caseMange/domain/vo/AddRemarkReq.java new file mode 100644 index 0000000..b92023f --- /dev/null +++ b/cas-system/src/main/java/com/inscloudtech/caseMange/domain/vo/AddRemarkReq.java @@ -0,0 +1,10 @@ +package com.inscloudtech.caseMange.domain.vo; + + +import lombok.Data; + +@Data +public class AddRemarkReq { + private String lawCaseId; + private String remark; +} diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/domain/CarInfo.java b/cas-system/src/main/java/com/inscloudtech/datacenter/domain/CarInfo.java index 0a58ce7..646c533 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/domain/CarInfo.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/domain/CarInfo.java @@ -1,6 +1,7 @@ package com.inscloudtech.datacenter.domain; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.*; @@ -104,4 +105,9 @@ public class CarInfo extends BaseEntity { @IndexField(fieldType = FieldType.KEYWORD) private String analysisResultId; + @ExcelIgnore + @TableField(exist = false) + @IndexField(exist = false) + private Integer lineNo; + } diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/domain/PublicFamily.java b/cas-system/src/main/java/com/inscloudtech/datacenter/domain/PublicFamily.java index 2d5b1d1..b581152 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/domain/PublicFamily.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/domain/PublicFamily.java @@ -1,6 +1,7 @@ package com.inscloudtech.datacenter.domain; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.*; @@ -43,11 +44,11 @@ public class PublicFamily extends BaseEntity { @IndexId(type = org.dromara.easyes.annotation.rely.IdType.CUSTOMIZE) private String id; /** - * 企业名字 + * 单位名称 */ @DeduplicationField - @UpdateValueLog(fieldName = "企业名字") - @ExcelProperty("企业名字") + @UpdateValueLog(fieldName = "单位名称") + @ExcelProperty("单位名称") @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "enterpriseNameHighlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) private String enterpriseName; @@ -91,22 +92,22 @@ public class PublicFamily extends BaseEntity { @TableField(exist = false) private String deptPostHighlight; - @UpdateValueLog(fieldName = "主要家庭成员1姓名") + @UpdateValueLog(fieldName = "家庭成员1姓名") @NameField @DeduplicationField @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "memberName1Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) - @ExcelProperty("主要家庭成员1姓名") + @ExcelProperty("家庭成员1姓名") private String memberName1; @JsonIgnore @TableField(exist = false) private String memberName1Highlight; - @UpdateValueLog(fieldName = "主要家庭成员1关系") - @ExcelProperty("主要家庭成员1关系") + @UpdateValueLog(fieldName = "家庭成员1关系") + @ExcelProperty("家庭成员1关系") @DeduplicationField - @Size(max = 10, message = "主要家庭成员1关系长度不能超过10") + @Size(max = 10, message = "家庭成员1关系长度不能超过10") @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "memberRelation1Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) private String memberRelation1; @@ -115,21 +116,21 @@ public class PublicFamily extends BaseEntity { @TableField(exist = false) private String memberRelation1Highlight; - @UpdateValueLog(fieldName = "主要家庭成员1身份证号") - @ExcelProperty("主要家庭成员1身份证号") + @UpdateValueLog(fieldName = "家庭成员1身份证号") + @ExcelProperty("家庭成员1身份证号") @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "memberIdCard1Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) @IdCardField @DeduplicationField - @Size(max = 18, message = "主要家庭成员1身份证号长度不能超过18") + @Size(max = 18, message = "家庭成员1身份证号长度不能超过18") private String memberIdCard1; @JsonIgnore @TableField(exist = false) private String memberIdCard1Highlight; - @UpdateValueLog(fieldName = "主要家庭成员1公司及职务") - @ExcelProperty("主要家庭成员1公司及职务") + @UpdateValueLog(fieldName = "家庭成员1公司及职务") + @ExcelProperty("家庭成员1公司及职务") @DeduplicationField @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "deptPost1Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) @@ -139,12 +140,12 @@ public class PublicFamily extends BaseEntity { @TableField(exist = false) private String deptPost1Highlight; - @UpdateValueLog(fieldName = "主要家庭成员2姓名") + @UpdateValueLog(fieldName = "家庭成员2姓名") @NameField @DeduplicationField @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "memberName2Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) - @ExcelProperty("主要家庭成员2姓名") + @ExcelProperty("家庭成员2姓名") private String memberName2; @JsonIgnore @@ -153,9 +154,9 @@ public class PublicFamily extends BaseEntity { @DeduplicationField - @UpdateValueLog(fieldName = "主要家庭成员2关系") - @ExcelProperty("主要家庭成员2关系") - @Size(max = 10, message = "主要家庭成员2关系长度不能超过10") + @UpdateValueLog(fieldName = "家庭成员2关系") + @ExcelProperty("家庭成员2关系") + @Size(max = 10, message = "家庭成员2关系长度不能超过10") @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "memberRelation2Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) private String memberRelation2; @@ -164,12 +165,12 @@ public class PublicFamily extends BaseEntity { @TableField(exist = false) private String memberRelation2Highlight; - @UpdateValueLog(fieldName = "主要家庭成员2身份证号") + @UpdateValueLog(fieldName = "家庭成员2身份证号") @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "memberIdCard2Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) @IdCardField - @ExcelProperty("主要家庭成员2身份证号") - @Size(max = 18, message = "主要家庭成员2身份证号长度不能超过18") + @ExcelProperty("家庭成员2身份证号") + @Size(max = 18, message = "家庭成员2身份证号长度不能超过18") @DeduplicationField private String memberIdCard2; @@ -178,8 +179,8 @@ public class PublicFamily extends BaseEntity { private String memberIdCard2Highlight; @DeduplicationField - @UpdateValueLog(fieldName = "主要家庭成员2公司及职务") - @ExcelProperty("主要家庭成员2公司及职务") + @UpdateValueLog(fieldName = "家庭成员2公司及职务") + @ExcelProperty("家庭成员2公司及职务") @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "deptPost2Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) private String deptPost2; @@ -189,11 +190,11 @@ public class PublicFamily extends BaseEntity { private String deptPost2Highlight; @DeduplicationField - @UpdateValueLog(fieldName = "主要家庭成员3姓名") + @UpdateValueLog(fieldName = "家庭成员3姓名") @NameField @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "memberName3Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) - @ExcelProperty("主要家庭成员3姓名") + @ExcelProperty("家庭成员3姓名") private String memberName3; @JsonIgnore @@ -201,9 +202,9 @@ public class PublicFamily extends BaseEntity { private String memberName3Highlight; @DeduplicationField - @UpdateValueLog(fieldName = "主要家庭成员3关系") - @ExcelProperty("主要家庭成员3关系") - @Size(max = 10, message = "主要家庭成员3关系长度不能超过10") + @UpdateValueLog(fieldName = "家庭成员3关系") + @ExcelProperty("家庭成员3关系") + @Size(max = 10, message = "家庭成员3关系长度不能超过10") @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "memberRelation3Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) private String memberRelation3; @@ -213,20 +214,20 @@ public class PublicFamily extends BaseEntity { private String memberRelation3Highlight; @DeduplicationField - @UpdateValueLog(fieldName = "主要家庭成员3身份证号") + @UpdateValueLog(fieldName = "家庭成员3身份证号") @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "memberIdCard3Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) - @ExcelProperty("主要家庭成员3身份证号") + @ExcelProperty("家庭成员3身份证号") @IdCardField - @Size(max = 18, message = "主要家庭成员3身份证号长度不能超过18") + @Size(max = 18, message = "家庭成员3身份证号长度不能超过18") private String memberIdCard3; @JsonIgnore @TableField(exist = false) private String memberIdCard3Highlight; - @UpdateValueLog(fieldName = "主要家庭成员3公司及职务") - @ExcelProperty("主要家庭成员3公司及职务") + @UpdateValueLog(fieldName = "家庭成员3公司及职务") + @ExcelProperty("家庭成员3公司及职务") @DeduplicationField @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "deptPost3Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) @@ -236,22 +237,22 @@ public class PublicFamily extends BaseEntity { @TableField(exist = false) private String deptPost3Highlight; - @UpdateValueLog(fieldName = "主要家庭成员4姓名") + @UpdateValueLog(fieldName = "家庭成员4姓名") @NameField @DeduplicationField @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "memberName4Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) - @ExcelProperty("主要家庭成员4姓名") + @ExcelProperty("家庭成员4姓名") private String memberName4; @JsonIgnore @TableField(exist = false) private String memberName4Highlight; - @UpdateValueLog(fieldName = "主要家庭成员4关系") - @ExcelProperty("主要家庭成员4关系") + @UpdateValueLog(fieldName = "家庭成员4关系") + @ExcelProperty("家庭成员4关系") @DeduplicationField - @Size(max = 10, message = "主要家庭成员4关系长度不能超过10") + @Size(max = 10, message = "家庭成员4关系长度不能超过10") @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "memberRelation4Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) private String memberRelation4; @@ -260,21 +261,21 @@ public class PublicFamily extends BaseEntity { @TableField(exist = false) private String memberRelation4Highlight; - @UpdateValueLog(fieldName = "主要家庭成员4身份证号") - @ExcelProperty("主要家庭成员4身份证号") + @UpdateValueLog(fieldName = "家庭成员4身份证号") + @ExcelProperty("家庭成员4身份证号") @DeduplicationField @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "memberIdCard4Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) @IdCardField - @Size(max = 18, message = "主要家庭成员4身份证号长度不能超过18") + @Size(max = 18, message = "家庭成员4身份证号长度不能超过18") private String memberIdCard4; @JsonIgnore @TableField(exist = false) private String memberIdCard4Highlight; - @UpdateValueLog(fieldName = "主要家庭成员4公司及职务") - @ExcelProperty("主要家庭成员4公司及职务") + @UpdateValueLog(fieldName = "家庭成员4公司及职务") + @ExcelProperty("家庭成员4公司及职务") @DeduplicationField @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "deptPost4Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) @@ -284,22 +285,22 @@ public class PublicFamily extends BaseEntity { @TableField(exist = false) private String deptPost4Highlight; - @UpdateValueLog(fieldName = "主要家庭成员5姓名") + @UpdateValueLog(fieldName = "家庭成员5姓名") @NameField @DeduplicationField @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "memberName5Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) - @ExcelProperty("主要家庭成员5姓名") + @ExcelProperty("家庭成员5姓名") private String memberName5; @JsonIgnore @TableField(exist = false) private String memberName5Highlight; - @UpdateValueLog(fieldName = "主要家庭成员5关系") - @ExcelProperty("主要家庭成员5关系") + @UpdateValueLog(fieldName = "家庭成员5关系") + @ExcelProperty("家庭成员5关系") @DeduplicationField - @Size(max = 10, message = "主要家庭成员5关系长度不能超过10") + @Size(max = 10, message = "家庭成员5关系长度不能超过10") @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "memberRelation5Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) private String memberRelation5; @@ -308,21 +309,21 @@ public class PublicFamily extends BaseEntity { @TableField(exist = false) private String memberRelation5Highlight; - @UpdateValueLog(fieldName = "主要家庭成员5身份证号") - @ExcelProperty("主要家庭成员5身份证号") + @UpdateValueLog(fieldName = "家庭成员5身份证号") + @ExcelProperty("家庭成员5身份证号") @DeduplicationField @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "memberIdCard5Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) @IdCardField - @Size(max = 18, message = "主要家庭成员5身份证号长度不能超过18") + @Size(max = 18, message = "家庭成员5身份证号长度不能超过18") private String memberIdCard5; @JsonIgnore @TableField(exist = false) private String memberIdCard5Highlight; - @UpdateValueLog(fieldName = "主要家庭成员5公司及职务") - @ExcelProperty("主要家庭成员5公司及职务") + @UpdateValueLog(fieldName = "家庭成员5公司及职务") + @ExcelProperty("家庭成员5公司及职务") @DeduplicationField @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "deptPost5Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) @@ -333,22 +334,22 @@ public class PublicFamily extends BaseEntity { private String deptPost5Highlight; - @UpdateValueLog(fieldName = "主要家庭成员6姓名") + @UpdateValueLog(fieldName = "家庭成员6姓名") @NameField @DeduplicationField @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "memberName6Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) - @ExcelProperty("主要家庭成员6姓名") + @ExcelProperty("家庭成员6姓名") private String memberName6; @JsonIgnore @TableField(exist = false) private String memberName6Highlight; - @UpdateValueLog(fieldName = "主要家庭成员6关系") - @ExcelProperty("主要家庭成员6关系") + @UpdateValueLog(fieldName = "家庭成员6关系") + @ExcelProperty("家庭成员6关系") @DeduplicationField - @Size(max = 10, message = "主要家庭成员6关系长度不能超过10") + @Size(max = 10, message = "家庭成员6关系长度不能超过10") @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "memberRelation6Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) private String memberRelation6; @@ -357,21 +358,21 @@ public class PublicFamily extends BaseEntity { @TableField(exist = false) private String memberRelation6Highlight; - @UpdateValueLog(fieldName = "主要家庭成员6身份证号") - @ExcelProperty("主要家庭成员6身份证号") + @UpdateValueLog(fieldName = "家庭成员6身份证号") + @ExcelProperty("家庭成员6身份证号") @DeduplicationField @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "memberIdCard6Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) @IdCardField - @Size(max = 18, message = "主要家庭成员6身份证号长度不能超过18") + @Size(max = 18, message = "家庭成员6身份证号长度不能超过18") private String memberIdCard6; @JsonIgnore @TableField(exist = false) private String memberIdCard6Highlight; - @UpdateValueLog(fieldName = "主要家庭成员6公司及职务") - @ExcelProperty("主要家庭成员6公司及职务") + @UpdateValueLog(fieldName = "家庭成员6公司及职务") + @ExcelProperty("家庭成员6公司及职务") @DeduplicationField @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "deptPost6Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) @@ -381,22 +382,22 @@ public class PublicFamily extends BaseEntity { @TableField(exist = false) private String deptPost6Highlight; - @UpdateValueLog(fieldName = "主要家庭成员7姓名") + @UpdateValueLog(fieldName = "家庭成员7姓名") @NameField @DeduplicationField @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "memberName7Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) - @ExcelProperty("主要家庭成员7姓名") + @ExcelProperty("家庭成员7姓名") private String memberName7; @JsonIgnore @TableField(exist = false) private String memberName7Highlight; - @UpdateValueLog(fieldName = "主要家庭成员7关系") - @ExcelProperty("主要家庭成员7关系") + @UpdateValueLog(fieldName = "家庭成员7关系") + @ExcelProperty("家庭成员7关系") @DeduplicationField - @Size(max = 10, message = "主要家庭成员7关系长度不能超过10") + @Size(max = 10, message = "家庭成员7关系长度不能超过10") @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "memberRelation7Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) private String memberRelation7; @@ -405,21 +406,21 @@ public class PublicFamily extends BaseEntity { @TableField(exist = false) private String memberRelation7Highlight; - @UpdateValueLog(fieldName = "主要家庭成员7身份证号") - @ExcelProperty("主要家庭成员7身份证号") + @UpdateValueLog(fieldName = "家庭成员7身份证号") + @ExcelProperty("家庭成员7身份证号") @DeduplicationField @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "memberIdCard7Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) @IdCardField - @Size(max = 18, message = "主要家庭成员7身份证号长度不能超过18") + @Size(max = 18, message = "家庭成员7身份证号长度不能超过18") private String memberIdCard7; @JsonIgnore @TableField(exist = false) private String memberIdCard7Highlight; - @UpdateValueLog(fieldName = "主要家庭成员7公司及职务") - @ExcelProperty("主要家庭成员7公司及职务") + @UpdateValueLog(fieldName = "家庭成员7公司及职务") + @ExcelProperty("家庭成员7公司及职务") @DeduplicationField @IndexField(fieldType = FieldType.KEYWORD_TEXT, analyzer = "ngram_analyzer") @HighLight(mappingField = "deptPost7Highlight",preTag = QueryCenterService.TAG_PREFIX,postTag = QueryCenterService.TAG_SUFFIX) @@ -454,4 +455,9 @@ public class PublicFamily extends BaseEntity { /** 分析成果id */ @IndexField(fieldType = FieldType.KEYWORD) private String analysisResultId; + + @ExcelIgnore + @TableField(exist = false) + @IndexField(exist = false) + private Integer lineNo; } 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 85760d9..a20cd8e 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 @@ -62,9 +62,9 @@ public class RealEstate extends BaseEntity { @IndexField(fieldType = FieldType.DOUBLE) private BigDecimal area; - @ExcelProperty(value = "购买价格",index = 3) + @ExcelProperty(value = "购买价格（万元）",index = 3) @DeduplicationField - @UpdateValueLog(fieldName = "购买价格") + @UpdateValueLog(fieldName = "购买价格（万元）") @IndexField(fieldType = FieldType.DOUBLE) private BigDecimal valuation; /** diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/domain/TransactionPartner.java b/cas-system/src/main/java/com/inscloudtech/datacenter/domain/TransactionPartner.java index b8cedf5..527cfa8 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/domain/TransactionPartner.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/domain/TransactionPartner.java @@ -1,6 +1,7 @@ package com.inscloudtech.datacenter.domain; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.*; @@ -149,4 +150,9 @@ public class TransactionPartner extends BaseEntity { /** 分析成果id */ @IndexField(fieldType = FieldType.KEYWORD) private String analysisResultId; + + @ExcelIgnore + @TableField(exist = false) + @IndexField(exist = false) + private Integer lineNo; } 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 aa469c8..2866842 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 @@ -261,8 +261,8 @@ public class RealEstateServiceImpl implements IRealEstateService { for (RealEstate importObj : importList) { String uniqueKey = importObj.getName() + importObj.getAddress(); if(map.containsKey(uniqueKey)){ - importObj.setId(null); - RealEstate update = BeanUtils.mergeObjects(map.get(uniqueKey), importObj); + RealEstate realEstate = map.get(uniqueKey); + RealEstate update = BeanUtils.mergeObjects(realEstate, importObj); updateList.add(update); }else { addList.add(importObj); @@ -307,13 +307,12 @@ public class RealEstateServiceImpl implements IRealEstateService { list.stream().forEach(update->{ partnerService.updateR(update); }); - esMapper.updateBatchByIds(list); return true; } - @UpdateLog(title = "不动产信息",mapperClass = RealEstateMapper.class) + @UpdateLog(title = "不动产信息",mapperClass = RealEstateEsMapper.class) public boolean updateR(RealEstate update) { - return baseMapper.updateById(update) > 0; + return esMapper.updateById(update) > 0; } private RealEstateServiceImpl getServiceImpl() {