","");
+ itemContent = itemContent.replaceAll("
","");
+ itemContent = itemContent.replaceAll("
","\n");
+ itemContent = itemContent.replaceAll("
","");
+ itemContent = itemContent.replaceAll("
","\n");
+ //获取所有新增内容的位置
+ String splitContentAdd = itemContent;
+ int addSpiltIndex = 0;
+ int cirIndex = 0;
+ int stLen = "
".length();
+ int edLen = "".length();
+ while (splitContentAdd.contains("
")) {
+ int addStIndex = splitContentAdd.indexOf("");
+ int addEdIndex = splitContentAdd.indexOf("");
+ if (addStIndex > -1) {
+ MarkTextVO markTextVO = new MarkTextVO();
+ markTextVO.setStartIndex(addSpiltIndex + addStIndex - (cirIndex*(stLen+edLen)));
+ markTextVO.setEndIndex(addSpiltIndex + addEdIndex - (cirIndex*(stLen+edLen)) - stLen);
+ addList.add(markTextVO);
+ addSpiltIndex = addSpiltIndex + addEdIndex + 7;
+// String replaceStr = splitContentAdd.substring(0,addStIndex);
+ splitContentAdd = splitContentAdd.substring(addEdIndex + 7,splitContentAdd.length());
+ cirIndex++;
+ }
+ }
+ //获取所有删除内容的位置
+ String splitContentDel = itemContent;
+ int delSpiltIndex = 0;
+ int cirIndexDel = 0;
+ int stLenDel = "".length();
+ int edLenDel = "".length();
+ while (splitContentDel.contains("")) {
+ int delStIndex = splitContentDel.indexOf("");
+ int delEdIndex = splitContentDel.indexOf("");
+ if (delStIndex > -1) {
+ MarkTextVO markTextVO = new MarkTextVO();
+ markTextVO.setStartIndex(delSpiltIndex + delStIndex - (cirIndexDel*(stLenDel+edLenDel)));
+ markTextVO.setEndIndex(delSpiltIndex + delEdIndex - (cirIndexDel*(stLenDel+edLenDel)) - stLenDel);
+ delList.add(markTextVO);
+ delSpiltIndex = delSpiltIndex + delEdIndex + 7;
+// String replaceStr = splitContentDel.substring(0,delStIndex);
+ splitContentDel = splitContentDel.substring(delEdIndex + 7,splitContentDel.length());
+ cirIndexDel++;
+ }
+ }
+ itemContent = itemContent.replaceAll("","");
+ itemContent = itemContent.replaceAll("","");
+ itemContent = itemContent.replaceAll("","");
+ itemContent = itemContent.replaceAll("","");
+ }
+ return itemContent;
+ }
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandCompareHisEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandCompareHisEOController.java
new file mode 100644
index 00000000..653201b2
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandCompareHisEOController.java
@@ -0,0 +1,133 @@
+package com.adc.da.slrs.standardSplit.controller;
+
+import com.adc.da.base.web.BaseController;
+import com.adc.da.http.PageInfo;
+import com.adc.da.person.dao.PersonCollectEODao;
+import com.adc.da.person.dao.PersonShareEODao;
+import com.adc.da.slrs.standardSplit.entity.SarStandCompareHisEO;
+import com.adc.da.slrs.standardSplit.entity.SarStandCompareHisEOPage;
+import com.adc.da.slrs.standardSplit.service.SarItemsCompareHisEOService;
+import com.adc.da.slrs.standardSplit.service.SarStandCompareHisEOService;
+import com.adc.da.slrs.standardSplit.service.SarStandItemsCompareHisEOService;
+import com.adc.da.sys.util.LoginUserUtil;
+import com.adc.da.sys.util.UUIDUtils;
+import com.adc.da.util.http.ResponseMessage;
+import com.adc.da.util.http.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE;
+
+@RestController
+@RequestMapping("/${restPath}/lawss/sarStandCompareHis")
+@Api(description = "|SarStandCompareHisEO|")
+public class SarStandCompareHisEOController extends BaseController {
+
+ private static final Logger logger = LoggerFactory.getLogger(SarStandCompareHisEOController.class);
+
+ @Autowired
+ private SarStandCompareHisEOService sarStandCompareHisEOService;
+
+ @Autowired
+ private SarStandItemsCompareHisEOService sarStandItemsCompareHisEOService;
+
+ @Autowired
+ private SarItemsCompareHisEOService sarItemsCompareHisEOService;
+
+ @Autowired
+ private PersonShareEODao personShareEODao;
+
+ @Autowired
+ private PersonCollectEODao personCollectEODao;
+
+ @ApiOperation(value = "|SarStandCompareHisEO|分页查询")
+ @GetMapping("/page")
+// @RequiresPermissions("lawss:sarStandCompareHis:page")
+ public ResponseMessage> page(SarStandCompareHisEOPage page) throws Exception {
+ List rows = sarStandCompareHisEOService.standCompareHisPage(page);
+ return Result.success(getPageInfo(page.getPager(), rows));
+ }
+
+ @ApiOperation(value = "|SarStandCompareHisEO|查询")
+ @GetMapping("")
+ //401问题2021-03-31暂时注释掉 liuhuiwen
+// @RequiresPermissions("lawss:sarStandCompareHis:list")
+ public ResponseMessage> list(SarStandCompareHisEOPage page) throws Exception {
+ return Result.success(sarStandCompareHisEOService.queryByList(page));
+ }
+
+ @ApiOperation(value = "|SarStandCompareHisEO|详情")
+ @GetMapping("/{id}")
+ //401问题2021-03-31暂时注释掉 liuhuiwen
+// @RequiresPermissions("lawss:sarStandCompareHis:get")
+ public ResponseMessage find(@PathVariable String id) throws Exception {
+ return Result.success(sarStandCompareHisEOService.selectByPrimaryKey(id));
+ }
+
+ @ApiOperation(value = "|SarStandCompareHisEO|新增")
+ @PostMapping("/addStandCompareHis")
+ //@RequiresPermissions("lawss:sarStandCompareHis:save")
+ public ResponseMessage addStandCompareHis(@RequestBody SarStandCompareHisEO sarStandCompareHisEO) {
+ try {
+ String id = UUIDUtils.randomUUID20();
+ sarStandCompareHisEO.setId(id);
+ sarStandCompareHisEO.setCreateUser(LoginUserUtil.getUserId());
+ sarStandCompareHisEO.setModifyUser(LoginUserUtil.getUserId());
+ sarStandCompareHisEO.setCreateTime(new Date());
+ sarStandCompareHisEO.setModifyTime(new Date());
+ sarStandCompareHisEOService.insertSelective(sarStandCompareHisEO);
+ return Result.success(id);
+ }catch (Exception e){
+ logger.error(e.getMessage(),e);
+ return Result.error("保存失败");
+ }
+ }
+
+ @ApiOperation(value = "|SarStandCompareHisEO|修改")
+ @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE)
+ //401问题2021-03-31暂时注释掉 liuhuiwen
+// @RequiresPermissions("lawss:sarStandCompareHis:update")
+ public ResponseMessage update(@RequestBody SarStandCompareHisEO sarStandCompareHisEO) throws Exception {
+ sarStandCompareHisEOService.updateByPrimaryKeySelective(sarStandCompareHisEO);
+ return Result.success(sarStandCompareHisEO);
+ }
+
+ @ApiOperation(value = "批量删除")
+ @PostMapping("/deleteByIds")
+// @RequiresPermissions("lawss:sarStandCompareHis:delete")
+ public ResponseMessage deleteByIds(String deleteByIdList){
+ String ids[] = deleteByIdList.split(",");
+ try {
+ for (String id : ids) {
+ sarStandCompareHisEOService.deleteByPrimaryKey(id);
+ sarStandItemsCompareHisEOService.deleteByStandHisId(id);
+ sarItemsCompareHisEOService.deleteByStandHisId(id);
+ personShareEODao.deleteByResId(id);
+ personCollectEODao.deleteByResId(id);
+ }
+ return Result.success("001","删除成功",true);
+ }catch (Exception e){
+ return Result.error("002","删除失败",false);
+ }
+ }
+
+ @ApiOperation(value = "条款比对")
+ @PostMapping("/clauseComparison")
+ public ResponseMessage> clauseComparison(String oldItemId, String newItemId, String standHisId) throws Exception {
+ Map resultMap = sarStandCompareHisEOService.clauseComparison(oldItemId,newItemId,standHisId);
+ return Result.success(resultMap);
+ }
+
+ @ApiOperation(value = "全文比对")
+ @PostMapping("/fullTextComparison")
+ public ResponseMessage> fullTextComparison(String leftStandard, String rightStandard) throws Exception {
+ Map resultMap = sarStandCompareHisEOService.fullTextComparison(leftStandard,rightStandard);
+ return Result.success(resultMap);
+ }
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandItemsCompareHisEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandItemsCompareHisEOController.java
new file mode 100644
index 00000000..de6ea81a
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandItemsCompareHisEOController.java
@@ -0,0 +1,284 @@
+package com.adc.da.slrs.standardSplit.controller;
+
+import com.adc.da.base.web.BaseController;
+import com.adc.da.common.HtmlTextExcel;
+import com.adc.da.common.ReadExcel;
+import com.adc.da.http.PageInfo;
+import com.adc.da.slrs.standardSplit.entity.SarStandItemsCompareHisEO;
+import com.adc.da.slrs.standardSplit.entity.SarStandItemsCompareHisEOPage;
+import com.adc.da.slrs.standardSplit.service.SarStandCompareHisEOService;
+import com.adc.da.slrs.standardSplit.service.SarStandItemsCompareHisEOService;
+import com.adc.da.slrs.standardSplit.vo.MarkTextVO;
+import com.adc.da.util.exception.AdcDaBaseException;
+import com.adc.da.util.http.ResponseMessage;
+import com.adc.da.util.http.Result;
+import com.adc.da.util.utils.IOUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.OutputStream;
+import java.util.*;
+import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE;
+
+@RestController
+@RequestMapping("/${restPath}/lawss/sarStandItemsCompareHis")
+@Api(description = "|SarStandItemsCompareHisEO|")
+public class SarStandItemsCompareHisEOController extends BaseController {
+
+ private static final Logger logger = LoggerFactory.getLogger(SarStandItemsCompareHisEOController.class);
+
+ @Autowired
+ private SarStandItemsCompareHisEOService sarStandItemsCompareHisEOService;
+
+ @Autowired
+ private SarStandCompareHisEOService sarStandCompareHisEOService;
+
+ @ApiOperation(value = "|SarStandItemsCompareHisEO|分页查询")
+ @GetMapping("/page")
+// @RequiresPermissions("lawss:sarStandItemsCompareHis:page")
+ public ResponseMessage> page(SarStandItemsCompareHisEOPage page) throws Exception {
+ List rows = sarStandItemsCompareHisEOService.queryByPage(page);
+ return Result.success(getPageInfo(page.getPager(), rows));
+ }
+
+ @ApiOperation(value = "|SarStandItemsCompareHisEO|查询")
+ @GetMapping("getStandItemsCompareHisList")
+// @RequiresPermissions("lawss:sarStandItemsCompareHis:list")
+ public ResponseMessage> list(SarStandItemsCompareHisEOPage page) throws Exception {
+ List list = sarStandItemsCompareHisEOService.queryByList(page);
+ Map pidMap = new HashMap<>();
+ for(SarStandItemsCompareHisEO sarStandItemsCompareHisEO : list){
+ pidMap.put(sarStandItemsCompareHisEO.getItemsNum(),sarStandItemsCompareHisEO.getId());
+ }
+ for(SarStandItemsCompareHisEO sarStandItemsCompareHisEO : list){
+ String menu = sarStandItemsCompareHisEO.getItemsNum();
+ if(menu.indexOf(".") > 0){
+ String menuP = menu.substring(0,menu.lastIndexOf("."));
+ sarStandItemsCompareHisEO.setPid(pidMap.get(menuP));
+ }else{
+ sarStandItemsCompareHisEO.setPid("");
+ }
+ }
+ return Result.success(list);
+ }
+
+ @ApiOperation(value = "|SarStandItemsCompareHisEO|详情")
+ @GetMapping("/{id}")
+ //401问题2021-03-31暂时注释掉 liuhuiwen
+// @RequiresPermissions("lawss:sarStandItemsCompareHis:get")
+ public ResponseMessage find(@PathVariable String id) throws Exception {
+ return Result.success(sarStandItemsCompareHisEOService.selectByPrimaryKey(id));
+ }
+
+ @ApiOperation(value = "|SarStandItemsCompareHisEO|新增")
+ @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE)
+ //401问题2021-03-31暂时注释掉 liuhuiwen
+// @RequiresPermissions("lawss:sarStandItemsCompareHis:save")
+ public ResponseMessage create(@RequestBody SarStandItemsCompareHisEO sarStandItemsCompareHisEO) throws Exception {
+ sarStandItemsCompareHisEOService.insertSelective(sarStandItemsCompareHisEO);
+ return Result.success(sarStandItemsCompareHisEO);
+ }
+
+ @ApiOperation(value = "|SarStandItemsCompareHisEO|修改")
+ @PutMapping("/updateCompareItems")
+// @RequiresPermissions("lawss:sarStandItemsCompareHis:update")
+ public ResponseMessage update(@RequestBody SarStandItemsCompareHisEO sarStandItemsCompareHisEO) throws Exception {
+ sarStandItemsCompareHisEO.setModifyTime(new Date());
+ sarStandItemsCompareHisEOService.updateByPrimaryKeySelective(sarStandItemsCompareHisEO);
+ return Result.success("0","保存成功",sarStandItemsCompareHisEO);
+ }
+
+ @ApiOperation(value = "|SarStandItemsCompareHisEO|删除")
+ @DeleteMapping("/{id}")
+ //401问题2021-03-31暂时注释掉 liuhuiwen
+// @RequiresPermissions("lawss:sarStandItemsCompareHis:delete")
+ public ResponseMessage delete(@PathVariable String id) throws Exception {
+ sarStandItemsCompareHisEOService.deleteByPrimaryKey(id);
+ logger.info("delete from SAR_STAND_ITEMS_COMPARE_HIS where id = {}", id);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "|SarItemsCompareHisEO|导出excel")
+ @GetMapping(value = "/exportItemsCompareHis")
+ public void exportItemsCompareHis(String standHisId, String exportName, HttpServletResponse response, HttpServletRequest request) throws Exception {
+ OutputStream os = null;
+ OutputStream excelOS = null;
+ HSSFWorkbook workbook = new HSSFWorkbook();
+ String fileOriName = "条款比对信息";
+ if (StringUtils.isNotEmpty(exportName)) {
+ fileOriName = exportName;
+ }
+ try{
+ String fileName = fileOriName + ".xls";
+ HSSFSheet sheetItemsLeft = workbook.createSheet("旧文档");
+ HSSFSheet sheetItemsRight = workbook.createSheet("新文档");
+ String[] headers = {"条款号","条款名称","条款内容","备注"};
+ // 基础样式
+ HSSFCellStyle cellStyleBase =workbook.createCellStyle();
+ cellStyleBase.setWrapText(true);
+ cellStyleBase.setVerticalAlignment(VerticalAlignment.CENTER);
+ HSSFFont fontBase = workbook.createFont();
+ fontBase.setColor(IndexedColors.BLACK.index);
+ // 增加文字样式
+ HSSFFont fontAdd = workbook.createFont();
+ fontAdd.setColor(IndexedColors.LIGHT_BLUE.index);
+ // 删除文字样式
+ HSSFFont fontDel = workbook.createFont();
+ fontDel.setColor(IndexedColors.RED.index);
+ //查询左侧全部条款
+ SarStandItemsCompareHisEOPage page = new SarStandItemsCompareHisEOPage();
+ page.setStandHisId(standHisId);
+ page.setLeftOrRight("LEFT");
+ List getLeftList = sarStandItemsCompareHisEOService.queryByList(page);
+ //查询右侧全部条款
+ page.setStandHisId(standHisId);
+ page.setLeftOrRight("RIGHT");
+ List getRightList = sarStandItemsCompareHisEOService.queryByList(page);
+ //左右两侧都不为空才会执行比对
+ if (getLeftList != null && !getLeftList.isEmpty() && getRightList != null && !getRightList.isEmpty()) {
+ for (SarStandItemsCompareHisEO compareHisEO : getLeftList) {
+ Integer targetStand = compareHisEO.getTargetStand();
+ if (targetStand != null) {
+ String oldItemId = compareHisEO.getItemsId();
+ if(getRightList.size() > targetStand){
+ SarStandItemsCompareHisEO rightCompareHis = getRightList.get(targetStand);
+ String newItemId = rightCompareHis.getItemsId();
+ Map resultMap = sarStandCompareHisEOService.clauseComparison(oldItemId,newItemId,standHisId);
+ List leftString = (ArrayList)resultMap.get("leftString");
+ List rightString = (ArrayList)resultMap.get("rightString");
+ String leftContent = "";
+ if (leftString != null && !leftString.isEmpty()) {
+ for (String content : leftString) {
+ leftContent += content;
+ }
+ }
+ compareHisEO.setItemsText(leftContent);
+ String rightContent = "";
+ if (rightString != null && !rightString.isEmpty()) {
+ for (String content : rightString) {
+ rightContent += content;
+ }
+ }
+ getRightList.get(targetStand).setItemsText(rightContent);
+ }
+ }
+ }
+ }
+ //导出左侧比对结果
+ if (getLeftList != null && !getLeftList.isEmpty()) {
+ // 左侧在excel表中添加表头
+ HSSFRow row = sheetItemsLeft.createRow(0);
+ sheetItemsLeft.setColumnWidth(0,20*256);
+ sheetItemsLeft.setColumnWidth(1,30*256);
+ sheetItemsLeft.setColumnWidth(2,100*256);
+ sheetItemsLeft.setColumnWidth(3,80*256);
+ for (int i = 0; i < headers.length; i++) {
+ HSSFCell cell = row.createCell(i);
+ HSSFRichTextString text = new HSSFRichTextString(headers[i]);
+ cell.setCellValue(text);
+ }
+ // 左侧放文字内容
+ for(int rowNum = 0;rowNum < getLeftList.size(); rowNum++){
+ HSSFRow row1 = sheetItemsLeft.createRow(rowNum + 1);
+ row1.createCell(0).setCellValue(getLeftList.get(rowNum).getItemsNum());
+ row1.createCell(1).setCellValue(getLeftList.get(rowNum).getItemsName());
+ row1.getCell(1).setCellStyle(cellStyleBase);
+ //处理条款内容
+ String itemText = getLeftList.get(rowNum).getItemsText();
+ List addList = new ArrayList<>();
+ List delList = new ArrayList<>();
+ itemText = HtmlTextExcel.changeHtmlToExcel(itemText,addList,delList);
+ HSSFRichTextString ts= new HSSFRichTextString(itemText);
+ ts.applyFont(0,ts.length(),fontBase);
+ if (addList != null && !addList.isEmpty()) {
+ for (MarkTextVO markTextVO : addList) {
+ int stIndex = markTextVO.getStartIndex();
+ int edIndex = markTextVO.getEndIndex();
+ ts.applyFont(stIndex,edIndex,fontAdd);
+ }
+ }
+ if (delList != null && !delList.isEmpty()) {
+ for (MarkTextVO markTextVO : delList) {
+ int stIndex = markTextVO.getStartIndex();
+ int edIndex = markTextVO.getEndIndex();
+ ts.applyFont(stIndex,edIndex,fontDel);
+ }
+ }
+ row1.createCell(2).setCellValue(ts);
+ row1.getCell(2).setCellStyle(cellStyleBase);
+ row1.createCell(3).setCellValue(getLeftList.get(rowNum).getRemark());
+ row1.getCell(3).setCellStyle(cellStyleBase);
+ }
+ }
+ //导出右侧比对结果
+ if (getRightList != null && !getRightList.isEmpty()) {
+ HSSFRow rowRightHeader = sheetItemsRight.createRow(0);
+ sheetItemsRight.setColumnWidth(0,20*256);
+ sheetItemsRight.setColumnWidth(1,30*256);
+ sheetItemsRight.setColumnWidth(2,100*256);
+ sheetItemsRight.setColumnWidth(3,80*256);
+ for (int i = 0; i < headers.length; i++) {
+ HSSFCell cell = rowRightHeader.createCell(i);
+ HSSFRichTextString text = new HSSFRichTextString(headers[i]);
+ cell.setCellValue(text);
+ }
+ // 右侧放文字内容
+ for(int rowNum = 0;rowNum < getRightList.size(); rowNum++){
+ HSSFRow row1 = sheetItemsRight.createRow(rowNum + 1);
+ row1.createCell(0).setCellValue(getRightList.get(rowNum).getItemsNum());
+ row1.createCell(1).setCellValue(getRightList.get(rowNum).getItemsName());
+ row1.getCell(1).setCellStyle(cellStyleBase);
+ //处理条款内容
+ String itemText = getRightList.get(rowNum).getItemsText();
+ List addList = new ArrayList<>();
+ List delList = new ArrayList<>();
+ itemText = HtmlTextExcel.changeHtmlToExcel(itemText,addList,delList);
+ HSSFRichTextString ts= new HSSFRichTextString(itemText);
+ ts.applyFont(0,ts.length(),fontBase);
+ if (addList != null && !addList.isEmpty()) {
+ for (MarkTextVO markTextVO : addList) {
+ int stIndex = markTextVO.getStartIndex();
+ int edIndex = markTextVO.getEndIndex();
+ ts.applyFont(stIndex,edIndex,fontAdd);
+ }
+ }
+ if (delList != null && !delList.isEmpty()) {
+ for (MarkTextVO markTextVO : delList) {
+ int stIndex = markTextVO.getStartIndex();
+ int edIndex = markTextVO.getEndIndex();
+ ts.applyFont(stIndex,edIndex,fontDel);
+ }
+ }
+ row1.createCell(2).setCellValue(ts);
+ row1.getCell(2).setCellStyle(cellStyleBase);
+ row1.createCell(3).setCellValue(getRightList.get(rowNum).getRemark());
+ row1.getCell(3).setCellStyle(cellStyleBase);
+ }
+ }
+ response.setHeader("Content-Disposition",
+ "attachment; filename=\"" + ReadExcel.encodeFileName(fileName, request) +"\"");
+ response.setContentType("application/force-download");
+ response.flushBuffer();
+ os = response.getOutputStream();
+ workbook.write(os);
+ os.flush();
+ os.close(); // 后开先关
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ throw new AdcDaBaseException("下载文件失败，请重试");
+ } finally {
+ IOUtils.closeQuietly(os);
+ IOUtils.closeQuietly(excelOS);
+ }
+ }
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarItemsCompareHisEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarItemsCompareHisEODao.java
new file mode 100644
index 00000000..ce9614d8
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarItemsCompareHisEODao.java
@@ -0,0 +1,23 @@
+package com.adc.da.slrs.standardSplit.dao;
+
+import com.adc.da.slrs.standardSplit.entity.SarItemsCompareHisEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ *
+ *
+ * 功能：SAR_ITEMS_COMPARE_HIS SarItemsCompareHisEODao
+ * 作者：code generator
+ * 日期： 2020-02-26
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */
+@Mapper
+public interface SarItemsCompareHisEODao extends BaseMapper {
+
+ @Delete("delete from SAR_ITEMS_COMPARE_HIS WHERE STAND_HIS_ID = #{standHisId}")
+ void deleteByStandHisId(String standHisId);
+
+ int insertSelective(SarItemsCompareHisEO sarItemsCompareHisEO);
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandCompareHisEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandCompareHisEODao.java
new file mode 100644
index 00000000..269f8d36
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandCompareHisEODao.java
@@ -0,0 +1,35 @@
+package com.adc.da.slrs.standardSplit.dao;
+
+import com.adc.da.slrs.standardSplit.entity.SarStandCompareHisEO;
+import com.adc.da.slrs.standardSplit.entity.SarStandCompareHisEOPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ *
+ *
+ * 功能：SAR_STAND_COMPARE_HIS SarStandCompareHisEODao
+ * 作者：code generator
+ * 日期： 2020-02-24
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */
+@Mapper
+public interface SarStandCompareHisEODao extends BaseMapper {
+
+ int queryByCount(SarStandCompareHisEOPage page);
+
+ List queryByPage(SarStandCompareHisEOPage page);
+
+ List queryByList(SarStandCompareHisEOPage page);
+
+ SarStandCompareHisEO selectByPrimaryKey(String id);
+
+ int insertSelective(SarStandCompareHisEO sarStandCompareHisEO);
+
+ int updateByPrimaryKeySelective(SarStandCompareHisEO sarStandCompareHisEO);
+
+ int deleteByPrimaryKey(String id);
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandItemsCompareHisEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandItemsCompareHisEODao.java
new file mode 100644
index 00000000..086345e5
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandItemsCompareHisEODao.java
@@ -0,0 +1,36 @@
+package com.adc.da.slrs.standardSplit.dao;
+
+import com.adc.da.slrs.standardSplit.entity.SarStandItemsCompareHisEO;
+import com.adc.da.slrs.standardSplit.entity.SarStandItemsCompareHisEOPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ *
+ *
+ * 功能：SAR_STAND_ITEMS_COMPARE_HIS SarStandItemsCompareHisEODao
+ * 作者：code generator
+ * 日期： 2020-02-24
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */
+@Mapper
+public interface SarStandItemsCompareHisEODao extends BaseMapper {
+
+ @Delete("delete from SAR_STAND_ITEMS_COMPARE_HIS WHERE STAND_HIS_ID = #{standHisId}")
+ void deleteByStandHisId(String standHisId);
+
+ int insertSelective(SarStandItemsCompareHisEO var);
+
+ List queryByPage(SarStandItemsCompareHisEOPage page);
+
+ List queryByList(SarStandItemsCompareHisEOPage page);
+
+ SarStandItemsCompareHisEO selectByPrimaryKey(String id);
+
+ void updateByPrimaryKeySelective(SarStandItemsCompareHisEO page);
+
+ void deleteByPrimaryKey(String id);
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarItemsCompareHisEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarItemsCompareHisEO.java
new file mode 100644
index 00000000..bd626150
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarItemsCompareHisEO.java
@@ -0,0 +1,283 @@
+package com.adc.da.slrs.standardSplit.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+/**
+ * 功能：SAR_ITEMS_COMPARE_HIS SarItemsCompareHisEOEntity
+ * 作者：code generator
+ * 日期： 2020-02-26
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */
+public class SarItemsCompareHisEO extends BaseEntity {
+
+ private String id;
+ private String oldItemsId;
+ private String oldItemsName;
+ private String oldItemsText;
+ private String newItemsId;
+ private String newItemsName;
+ private String newItemsText;
+ private String createUser;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+ private String modifyUser;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date modifyTime;
+ private String standHisId;
+ private String similarityDegree;
+ private String oldItemsNum;
+ private String newItemsNum;
+ private String oldRemark;
+ private String newRemark;
+
+ /**
+ * java字段名转换为原始数据库列名。如果不存在则返回null
+ * 字段列表：
+ * id -> id
+ * oldItemsId -> old_items_id
+ * oldItemsName -> old_items_name
+ * oldItemsText -> old_items_text
+ * newItemsId -> new_items_id
+ * newItemsName -> new_items_name
+ * newItemsText -> new_items_text
+ * createUser -> create_user
+ * createTime -> create_time
+ * modifyUser -> modify_user
+ * modifyTime -> modify_time
+ * standHisId -> stand_his_id
+ * similarityDegree -> similarity_degree
+ * oldItemsNum -> old_items_num
+ * newItemsNum -> new_items_num
+ */
+ public static String fieldToColumn(String fieldName) {
+ if (fieldName == null) return null;
+ switch (fieldName) {
+ case "id": return "id";
+ case "oldItemsId": return "old_items_id";
+ case "oldItemsName": return "old_items_name";
+ case "oldItemsText": return "old_items_text";
+ case "newItemsId": return "new_items_id";
+ case "newItemsName": return "new_items_name";
+ case "newItemsText": return "new_items_text";
+ case "createUser": return "create_user";
+ case "createTime": return "create_time";
+ case "modifyUser": return "modify_user";
+ case "modifyTime": return "modify_time";
+ case "standHisId": return "stand_his_id";
+ case "similarityDegree": return "similarity_degree";
+ case "oldItemsNum": return "old_items_num";
+ case "newItemsNum": return "new_items_num";
+ default: return null;
+ }
+ }
+
+ /**
+ * 原始数据库列名转换为java字段名。如果不存在则返回null
+ * 字段列表：
+ * id -> id
+ * old_items_id -> oldItemsId
+ * old_items_name -> oldItemsName
+ * old_items_text -> oldItemsText
+ * new_items_id -> newItemsId
+ * new_items_name -> newItemsName
+ * new_items_text -> newItemsText
+ * create_user -> createUser
+ * create_time -> createTime
+ * modify_user -> modifyUser
+ * modify_time -> modifyTime
+ * stand_his_id -> standHisId
+ * similarity_degree -> similarityDegree
+ * old_items_num -> oldItemsNum
+ * new_items_num -> newItemsNum
+ */
+ public static String columnToField(String columnName) {
+ if (columnName == null) return null;
+ switch (columnName) {
+ case "id": return "id";
+ case "old_items_id": return "oldItemsId";
+ case "old_items_name": return "oldItemsName";
+ case "old_items_text": return "oldItemsText";
+ case "new_items_id": return "newItemsId";
+ case "new_items_name": return "newItemsName";
+ case "new_items_text": return "newItemsText";
+ case "create_user": return "createUser";
+ case "create_time": return "createTime";
+ case "modify_user": return "modifyUser";
+ case "modify_time": return "modifyTime";
+ case "stand_his_id": return "standHisId";
+ case "similarity_degree": return "similarityDegree";
+ case "old_items_num": return "oldItemsNum";
+ case "new_items_num": return "newItemsNum";
+ default: return null;
+ }
+ }
+
+ /** **/
+ public String getId() {
+ return this.id;
+ }
+
+ /** **/
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ /** **/
+ public String getOldItemsId() {
+ return this.oldItemsId;
+ }
+
+ /** **/
+ public void setOldItemsId(String oldItemsId) {
+ this.oldItemsId = oldItemsId;
+ }
+
+ /** **/
+ public String getOldItemsName() {
+ return this.oldItemsName;
+ }
+
+ /** **/
+ public void setOldItemsName(String oldItemsName) {
+ this.oldItemsName = oldItemsName;
+ }
+
+ /** **/
+ public String getOldItemsText() {
+ return this.oldItemsText;
+ }
+
+ /** **/
+ public void setOldItemsText(String oldItemsText) {
+ this.oldItemsText = oldItemsText;
+ }
+
+ /** **/
+ public String getNewItemsId() {
+ return this.newItemsId;
+ }
+
+ /** **/
+ public void setNewItemsId(String newItemsId) {
+ this.newItemsId = newItemsId;
+ }
+
+ /** **/
+ public String getNewItemsName() {
+ return this.newItemsName;
+ }
+
+ /** **/
+ public void setNewItemsName(String newItemsName) {
+ this.newItemsName = newItemsName;
+ }
+
+ /** **/
+ public String getNewItemsText() {
+ return this.newItemsText;
+ }
+
+ /** **/
+ public void setNewItemsText(String newItemsText) {
+ this.newItemsText = newItemsText;
+ }
+
+ /** **/
+ public String getCreateUser() {
+ return this.createUser;
+ }
+
+ /** **/
+ public void setCreateUser(String createUser) {
+ this.createUser = createUser;
+ }
+
+ /** **/
+ public Date getCreateTime() {
+ return this.createTime;
+ }
+
+ /** **/
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ /** **/
+ public String getModifyUser() {
+ return this.modifyUser;
+ }
+
+ /** **/
+ public void setModifyUser(String modifyUser) {
+ this.modifyUser = modifyUser;
+ }
+
+ /** **/
+ public Date getModifyTime() {
+ return this.modifyTime;
+ }
+
+ /** **/
+ public void setModifyTime(Date modifyTime) {
+ this.modifyTime = modifyTime;
+ }
+
+ /** **/
+ public String getStandHisId() {
+ return this.standHisId;
+ }
+
+ /** **/
+ public void setStandHisId(String standHisId) {
+ this.standHisId = standHisId;
+ }
+
+ /** **/
+ public String getSimilarityDegree() {
+ return this.similarityDegree;
+ }
+
+ /** **/
+ public void setSimilarityDegree(String similarityDegree) {
+ this.similarityDegree = similarityDegree;
+ }
+
+ /** **/
+ public String getOldItemsNum() {
+ return this.oldItemsNum;
+ }
+
+ /** **/
+ public void setOldItemsNum(String oldItemsNum) {
+ this.oldItemsNum = oldItemsNum;
+ }
+
+ /** **/
+ public String getNewItemsNum() {
+ return this.newItemsNum;
+ }
+
+ /** **/
+ public void setNewItemsNum(String newItemsNum) {
+ this.newItemsNum = newItemsNum;
+ }
+
+ public String getOldRemark() {
+ return oldRemark;
+ }
+
+ public void setOldRemark(String oldRemark) {
+ this.oldRemark = oldRemark;
+ }
+
+ public String getNewRemark() {
+ return newRemark;
+ }
+
+ public void setNewRemark(String newRemark) {
+ this.newRemark = newRemark;
+ }
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEO.java
new file mode 100644
index 00000000..8025b05a
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEO.java
@@ -0,0 +1,329 @@
+package com.adc.da.slrs.standardSplit.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 功能：SAR_STAND_COMPARE_HIS SarStandCompareHisEOEntity
+ * 作者：code generator
+ * 日期： 2020-02-24
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */
+public class SarStandCompareHisEO extends BaseEntity {
+
+ private String compareType;
+ private String id;
+ private String oldStandId;
+ private String oldStandNum;
+ private String oldStandName;
+ private String newStandId;
+ private String newStandNum;
+ private String newStandName;
+ private String oldFileType;
+ private String oldFileTypeShow;
+ private String oldSarType;
+ private String createUser;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+ private String modifyUser;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date modifyTime;
+ private String newFileType;
+ private String newFileTypeShow;
+ private String newSarType;
+ private String collectId;
+
+ private List resLeftMapList = new ArrayList<>();
+
+ private List resRightMapList = new ArrayList<>();
+
+ /**
+ * java字段名转换为原始数据库列名。如果不存在则返回null
+ * 字段列表：
+ * compareType -> compare_type
+ * id -> id
+ * oldStandId -> old_stand_id
+ * oldStandNum -> old_stand_num
+ * oldStandName -> old_stand_name
+ * newStandId -> new_stand_id
+ * newStandNum -> new_stand_num
+ * newStandName -> new_stand_name
+ * oldFileType -> old_file_type
+ * oldSarType -> old_sar_type
+ * createUser -> create_user
+ * createTime -> create_time
+ * modifyUser -> modify_user
+ * modifyTime -> modify_time
+ * newFileType -> new_file_type
+ * newSarType -> new_sar_type
+ */
+ public static String fieldToColumn(String fieldName) {
+ if (fieldName == null) return null;
+ switch (fieldName) {
+ case "compareType": return "compare_type";
+ case "id": return "id";
+ case "oldStandId": return "old_stand_id";
+ case "oldStandNum": return "old_stand_num";
+ case "oldStandName": return "old_stand_name";
+ case "newStandId": return "new_stand_id";
+ case "newStandNum": return "new_stand_num";
+ case "newStandName": return "new_stand_name";
+ case "oldFileType": return "old_file_type";
+ case "oldSarType": return "old_sar_type";
+ case "createUser": return "create_user";
+ case "createTime": return "create_time";
+ case "modifyUser": return "modify_user";
+ case "modifyTime": return "modify_time";
+ case "newFileType": return "new_file_type";
+ case "newSarType": return "new_sar_type";
+ default: return null;
+ }
+ }
+
+ /**
+ * 原始数据库列名转换为java字段名。如果不存在则返回null
+ * 字段列表：
+ * compare_type -> compareType
+ * id -> id
+ * old_stand_id -> oldStandId
+ * old_stand_num -> oldStandNum
+ * old_stand_name -> oldStandName
+ * new_stand_id -> newStandId
+ * new_stand_num -> newStandNum
+ * new_stand_name -> newStandName
+ * old_file_type -> oldFileType
+ * old_sar_type -> oldSarType
+ * create_user -> createUser
+ * create_time -> createTime
+ * modify_user -> modifyUser
+ * modify_time -> modifyTime
+ * new_file_type -> newFileType
+ * new_sar_type -> newSarType
+ */
+ public static String columnToField(String columnName) {
+ if (columnName == null) return null;
+ switch (columnName) {
+ case "compare_type": return "compareType";
+ case "id": return "id";
+ case "old_stand_id": return "oldStandId";
+ case "old_stand_num": return "oldStandNum";
+ case "old_stand_name": return "oldStandName";
+ case "new_stand_id": return "newStandId";
+ case "new_stand_num": return "newStandNum";
+ case "new_stand_name": return "newStandName";
+ case "old_file_type": return "oldFileType";
+ case "old_sar_type": return "oldSarType";
+ case "create_user": return "createUser";
+ case "create_time": return "createTime";
+ case "modify_user": return "modifyUser";
+ case "modify_time": return "modifyTime";
+ case "new_file_type": return "newFileType";
+ case "new_sar_type": return "newSarType";
+ default: return null;
+ }
+ }
+
+ /** **/
+ public String getCompareType() {
+ return this.compareType;
+ }
+
+ /** **/
+ public void setCompareType(String compareType) {
+ this.compareType = compareType;
+ }
+
+ /** **/
+ public String getId() {
+ return this.id;
+ }
+
+ /** **/
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ /** **/
+ public String getOldStandId() {
+ return this.oldStandId;
+ }
+
+ /** **/
+ public void setOldStandId(String oldStandId) {
+ this.oldStandId = oldStandId;
+ }
+
+ /** **/
+ public String getOldStandNum() {
+ return this.oldStandNum;
+ }
+
+ /** **/
+ public void setOldStandNum(String oldStandNum) {
+ this.oldStandNum = oldStandNum;
+ }
+
+ /** **/
+ public String getOldStandName() {
+ return this.oldStandName;
+ }
+
+ /** **/
+ public void setOldStandName(String oldStandName) {
+ this.oldStandName = oldStandName;
+ }
+
+ /** **/
+ public String getNewStandId() {
+ return this.newStandId;
+ }
+
+ /** **/
+ public void setNewStandId(String newStandId) {
+ this.newStandId = newStandId;
+ }
+
+ /** **/
+ public String getNewStandNum() {
+ return this.newStandNum;
+ }
+
+ /** **/
+ public void setNewStandNum(String newStandNum) {
+ this.newStandNum = newStandNum;
+ }
+
+ /** **/
+ public String getNewStandName() {
+ return this.newStandName;
+ }
+
+ /** **/
+ public void setNewStandName(String newStandName) {
+ this.newStandName = newStandName;
+ }
+
+ /** **/
+ public String getOldFileType() {
+ return this.oldFileType;
+ }
+
+ /** **/
+ public void setOldFileType(String oldFileType) {
+ this.oldFileType = oldFileType;
+ }
+
+ /** **/
+ public String getOldSarType() {
+ return this.oldSarType;
+ }
+
+ /** **/
+ public void setOldSarType(String oldSarType) {
+ this.oldSarType = oldSarType;
+ }
+
+ /** **/
+ public String getCreateUser() {
+ return this.createUser;
+ }
+
+ /** **/
+ public void setCreateUser(String createUser) {
+ this.createUser = createUser;
+ }
+
+ /** **/
+ public Date getCreateTime() {
+ return this.createTime;
+ }
+
+ /** **/
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ /** **/
+ public String getModifyUser() {
+ return this.modifyUser;
+ }
+
+ /** **/
+ public void setModifyUser(String modifyUser) {
+ this.modifyUser = modifyUser;
+ }
+
+ /** **/
+ public Date getModifyTime() {
+ return this.modifyTime;
+ }
+
+ /** **/
+ public void setModifyTime(Date modifyTime) {
+ this.modifyTime = modifyTime;
+ }
+
+ /** **/
+ public String getNewFileType() {
+ return this.newFileType;
+ }
+
+ /** **/
+ public void setNewFileType(String newFileType) {
+ this.newFileType = newFileType;
+ }
+
+ /** **/
+ public String getNewSarType() {
+ return this.newSarType;
+ }
+
+ /** **/
+ public void setNewSarType(String newSarType) {
+ this.newSarType = newSarType;
+ }
+
+ public List getResLeftMapList() {
+ return resLeftMapList;
+ }
+
+ public void setResLeftMapList(List resLeftMapList) {
+ this.resLeftMapList = resLeftMapList;
+ }
+
+ public List getResRightMapList() {
+ return resRightMapList;
+ }
+
+ public void setResRightMapList(List resRightMapList) {
+ this.resRightMapList = resRightMapList;
+ }
+
+ public String getOldFileTypeShow() {
+ return oldFileTypeShow;
+ }
+
+ public void setOldFileTypeShow(String oldFileTypeShow) {
+ this.oldFileTypeShow = oldFileTypeShow;
+ }
+
+ public String getNewFileTypeShow() {
+ return newFileTypeShow;
+ }
+
+ public void setNewFileTypeShow(String newFileTypeShow) {
+ this.newFileTypeShow = newFileTypeShow;
+ }
+
+ public String getCollectId() {
+ return collectId;
+ }
+
+ public void setCollectId(String collectId) {
+ this.collectId = collectId;
+ }
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEOPage.java
new file mode 100644
index 00000000..3bf314dd
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEOPage.java
@@ -0,0 +1,377 @@
+package com.adc.da.slrs.standardSplit.entity;
+
+import com.adc.da.base.page.BasePage;
+
+/**
+ * 功能：SAR_STAND_COMPARE_HIS SarStandCompareHisEOPage
+ * 作者：code generator
+ * 日期： 2020-02-24
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */
+public class SarStandCompareHisEOPage extends BasePage {
+
+ private String compareType;
+ private String compareTypeOperator = "=";
+ private String id;
+ private String idOperator = "=";
+ private String oldStandId;
+ private String oldStandIdOperator = "=";
+ private String oldStandNum;
+ private String oldStandNumOperator = "=";
+ private String oldStandName;
+ private String oldStandNameOperator = "=";
+ private String newStandId;
+ private String newStandIdOperator = "=";
+ private String newStandNum;
+ private String newStandNumOperator = "=";
+ private String newStandName;
+ private String newStandNameOperator = "=";
+ private String oldFileType;
+ private String oldFileTypeOperator = "=";
+ private String oldSarType;
+ private String oldSarTypeOperator = "=";
+ private String createUser;
+ private String createUserOperator = "=";
+ private String createTime;
+ private String createTime1;
+ private String createTime2;
+ private String createTimeOperator = "=";
+ private String modifyUser;
+ private String modifyUserOperator = "=";
+ private String modifyTime;
+ private String modifyTime1;
+ private String modifyTime2;
+ private String modifyTimeOperator = "=";
+ private String newFileType;
+ private String newFileTypeOperator = "=";
+ private String newSarType;
+ private String newSarTypeOperator = "=";
+
+ private String oldNumOrName;
+
+ private String newNumOrName;
+
+ private String shunxu;
+
+ private String sql;
+
+ public String getCompareType() {
+ return this.compareType;
+ }
+
+ public void setCompareType(String compareType) {
+ this.compareType = compareType;
+ }
+
+ public String getCompareTypeOperator() {
+ return this.compareTypeOperator;
+ }
+
+ public void setCompareTypeOperator(String compareTypeOperator) {
+ this.compareTypeOperator = compareTypeOperator;
+ }
+
+ public String getId() {
+ return this.id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getIdOperator() {
+ return this.idOperator;
+ }
+
+ public void setIdOperator(String idOperator) {
+ this.idOperator = idOperator;
+ }
+
+ public String getOldStandId() {
+ return this.oldStandId;
+ }
+
+ public void setOldStandId(String oldStandId) {
+ this.oldStandId = oldStandId;
+ }
+
+ public String getOldStandIdOperator() {
+ return this.oldStandIdOperator;
+ }
+
+ public void setOldStandIdOperator(String oldStandIdOperator) {
+ this.oldStandIdOperator = oldStandIdOperator;
+ }
+
+ public String getOldStandNum() {
+ return this.oldStandNum;
+ }
+
+ public void setOldStandNum(String oldStandNum) {
+ this.oldStandNum = oldStandNum;
+ }
+
+ public String getOldStandNumOperator() {
+ return this.oldStandNumOperator;
+ }
+
+ public void setOldStandNumOperator(String oldStandNumOperator) {
+ this.oldStandNumOperator = oldStandNumOperator;
+ }
+
+ public String getOldStandName() {
+ return this.oldStandName;
+ }
+
+ public void setOldStandName(String oldStandName) {
+ this.oldStandName = oldStandName;
+ }
+
+ public String getOldStandNameOperator() {
+ return this.oldStandNameOperator;
+ }
+
+ public void setOldStandNameOperator(String oldStandNameOperator) {
+ this.oldStandNameOperator = oldStandNameOperator;
+ }
+
+ public String getNewStandId() {
+ return this.newStandId;
+ }
+
+ public void setNewStandId(String newStandId) {
+ this.newStandId = newStandId;
+ }
+
+ public String getNewStandIdOperator() {
+ return this.newStandIdOperator;
+ }
+
+ public void setNewStandIdOperator(String newStandIdOperator) {
+ this.newStandIdOperator = newStandIdOperator;
+ }
+
+ public String getNewStandNum() {
+ return this.newStandNum;
+ }
+
+ public void setNewStandNum(String newStandNum) {
+ this.newStandNum = newStandNum;
+ }
+
+ public String getNewStandNumOperator() {
+ return this.newStandNumOperator;
+ }
+
+ public void setNewStandNumOperator(String newStandNumOperator) {
+ this.newStandNumOperator = newStandNumOperator;
+ }
+
+ public String getNewStandName() {
+ return this.newStandName;
+ }
+
+ public void setNewStandName(String newStandName) {
+ this.newStandName = newStandName;
+ }
+
+ public String getNewStandNameOperator() {
+ return this.newStandNameOperator;
+ }
+
+ public void setNewStandNameOperator(String newStandNameOperator) {
+ this.newStandNameOperator = newStandNameOperator;
+ }
+
+ public String getOldFileType() {
+ return this.oldFileType;
+ }
+
+ public void setOldFileType(String oldFileType) {
+ this.oldFileType = oldFileType;
+ }
+
+ public String getOldFileTypeOperator() {
+ return this.oldFileTypeOperator;
+ }
+
+ public void setOldFileTypeOperator(String oldFileTypeOperator) {
+ this.oldFileTypeOperator = oldFileTypeOperator;
+ }
+
+ public String getOldSarType() {
+ return this.oldSarType;
+ }
+
+ public void setOldSarType(String oldSarType) {
+ this.oldSarType = oldSarType;
+ }
+
+ public String getOldSarTypeOperator() {
+ return this.oldSarTypeOperator;
+ }
+
+ public void setOldSarTypeOperator(String oldSarTypeOperator) {
+ this.oldSarTypeOperator = oldSarTypeOperator;
+ }
+
+ public String getCreateUser() {
+ return this.createUser;
+ }
+
+ public void setCreateUser(String createUser) {
+ this.createUser = createUser;
+ }
+
+ public String getCreateUserOperator() {
+ return this.createUserOperator;
+ }
+
+ public void setCreateUserOperator(String createUserOperator) {
+ this.createUserOperator = createUserOperator;
+ }
+
+ public String getCreateTime() {
+ return this.createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateTime1() {
+ return this.createTime1;
+ }
+
+ public void setCreateTime1(String createTime1) {
+ this.createTime1 = createTime1;
+ }
+
+ public String getCreateTime2() {
+ return this.createTime2;
+ }
+
+ public void setCreateTime2(String createTime2) {
+ this.createTime2 = createTime2;
+ }
+
+ public String getCreateTimeOperator() {
+ return this.createTimeOperator;
+ }
+
+ public void setCreateTimeOperator(String createTimeOperator) {
+ this.createTimeOperator = createTimeOperator;
+ }
+
+ public String getModifyUser() {
+ return this.modifyUser;
+ }
+
+ public void setModifyUser(String modifyUser) {
+ this.modifyUser = modifyUser;
+ }
+
+ public String getModifyUserOperator() {
+ return this.modifyUserOperator;
+ }
+
+ public void setModifyUserOperator(String modifyUserOperator) {
+ this.modifyUserOperator = modifyUserOperator;
+ }
+
+ public String getModifyTime() {
+ return this.modifyTime;
+ }
+
+ public void setModifyTime(String modifyTime) {
+ this.modifyTime = modifyTime;
+ }
+
+ public String getModifyTime1() {
+ return this.modifyTime1;
+ }
+
+ public void setModifyTime1(String modifyTime1) {
+ this.modifyTime1 = modifyTime1;
+ }
+
+ public String getModifyTime2() {
+ return this.modifyTime2;
+ }
+
+ public void setModifyTime2(String modifyTime2) {
+ this.modifyTime2 = modifyTime2;
+ }
+
+ public String getModifyTimeOperator() {
+ return this.modifyTimeOperator;
+ }
+
+ public void setModifyTimeOperator(String modifyTimeOperator) {
+ this.modifyTimeOperator = modifyTimeOperator;
+ }
+
+ public String getNewFileType() {
+ return this.newFileType;
+ }
+
+ public void setNewFileType(String newFileType) {
+ this.newFileType = newFileType;
+ }
+
+ public String getNewFileTypeOperator() {
+ return this.newFileTypeOperator;
+ }
+
+ public void setNewFileTypeOperator(String newFileTypeOperator) {
+ this.newFileTypeOperator = newFileTypeOperator;
+ }
+
+ public String getNewSarType() {
+ return this.newSarType;
+ }
+
+ public void setNewSarType(String newSarType) {
+ this.newSarType = newSarType;
+ }
+
+ public String getNewSarTypeOperator() {
+ return this.newSarTypeOperator;
+ }
+
+ public void setNewSarTypeOperator(String newSarTypeOperator) {
+ this.newSarTypeOperator = newSarTypeOperator;
+ }
+
+ public String getOldNumOrName() {
+ return oldNumOrName;
+ }
+
+ public void setOldNumOrName(String oldNumOrName) {
+ this.oldNumOrName = oldNumOrName;
+ }
+
+ public String getNewNumOrName() {
+ return newNumOrName;
+ }
+
+ public void setNewNumOrName(String newNumOrName) {
+ this.newNumOrName = newNumOrName;
+ }
+
+ public String getShunxu() {
+ return shunxu;
+ }
+
+ public void setShunxu(String shunxu) {
+ this.shunxu = shunxu;
+ }
+
+ public String getSql() {
+ return sql;
+ }
+
+ public void setSql(String sql) {
+ this.sql = sql;
+ }
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandItemsCompareHisEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandItemsCompareHisEO.java
new file mode 100644
index 00000000..65dab55a
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandItemsCompareHisEO.java
@@ -0,0 +1,222 @@
+package com.adc.da.slrs.standardSplit.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 功能：SAR_STAND_ITEMS_COMPARE_HIS SarStandItemsCompareHisEOEntity
+ * 作者：code generator
+ * 日期： 2020-02-24
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */
+public class SarStandItemsCompareHisEO extends BaseEntity {
+
+ private String id;
+ private String itemsId;
+ private String itemsName;
+ private String itemsNum;
+ private String itemsText;
+ private Integer itemsDisplayNum;
+ private Integer targetStand;
+ private String leftOrRight;
+ private String standHisId;
+ @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+ @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date modifyTime;
+ private String remark;
+ private String pid;
+
+ /**
+ * java字段名转换为原始数据库列名。如果不存在则返回null
+ * 字段列表：
+ * id -> id
+ * itemsId -> items_id
+ * itemsName -> items_name
+ * itemsNum -> items_num
+ * itemsText -> items_text
+ * itemsDisplayNum -> items_display_num
+ * targetStand -> target_stand
+ * leftOrRight -> left_or_right
+ * standHisId -> stand_his_id
+ * createTime -> create_time
+ * modifyTime -> modify_time
+ */
+ public static String fieldToColumn(String fieldName) {
+ if (fieldName == null) return null;
+ switch (fieldName) {
+ case "id": return "id";
+ case "itemsId": return "items_id";
+ case "itemsName": return "items_name";
+ case "itemsNum": return "items_num";
+ case "itemsText": return "items_text";
+ case "itemsDisplayNum": return "items_display_num";
+ case "targetStand": return "target_stand";
+ case "leftOrRight": return "left_or_right";
+ case "standHisId": return "stand_his_id";
+ case "createTime": return "create_time";
+ case "modifyTime": return "modify_time";
+ default: return null;
+ }
+ }
+
+ /**
+ * 原始数据库列名转换为java字段名。如果不存在则返回null
+ * 字段列表：
+ * id -> id
+ * items_id -> itemsId
+ * items_name -> itemsName
+ * items_num -> itemsNum
+ * items_text -> itemsText
+ * items_display_num -> itemsDisplayNum
+ * target_stand -> targetStand
+ * left_or_right -> leftOrRight
+ * stand_his_id -> standHisId
+ * create_time -> createTime
+ * modify_time -> modifyTime
+ */
+ public static String columnToField(String columnName) {
+ if (columnName == null) return null;
+ switch (columnName) {
+ case "id": return "id";
+ case "items_id": return "itemsId";
+ case "items_name": return "itemsName";
+ case "items_num": return "itemsNum";
+ case "items_text": return "itemsText";
+ case "items_display_num": return "itemsDisplayNum";
+ case "target_stand": return "targetStand";
+ case "left_or_right": return "leftOrRight";
+ case "stand_his_id": return "standHisId";
+ case "create_time": return "createTime";
+ case "modify_time": return "modifyTime";
+ default: return null;
+ }
+ }
+
+ /** **/
+ public String getId() {
+ return this.id;
+ }
+
+ /** **/
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ /** **/
+ public String getItemsId() {
+ return this.itemsId;
+ }
+
+ /** **/
+ public void setItemsId(String itemsId) {
+ this.itemsId = itemsId;
+ }
+
+ /** **/
+ public String getItemsName() {
+ return this.itemsName;
+ }
+
+ /** **/
+ public void setItemsName(String itemsName) {
+ this.itemsName = itemsName;
+ }
+
+ /** **/
+ public String getItemsNum() {
+ return this.itemsNum;
+ }
+
+ /** **/
+ public void setItemsNum(String itemsNum) {
+ this.itemsNum = itemsNum;
+ }
+
+ /** **/
+ public String getItemsText() {
+ return this.itemsText;
+ }
+
+ /** **/
+ public void setItemsText(String itemsText) {
+ this.itemsText = itemsText;
+ }
+
+ /** **/
+ public Integer getItemsDisplayNum() {
+ return this.itemsDisplayNum;
+ }
+
+ /** **/
+ public void setItemsDisplayNum(Integer itemsDisplayNum) {
+ this.itemsDisplayNum = itemsDisplayNum;
+ }
+
+ /** **/
+ public Integer getTargetStand() {
+ return this.targetStand;
+ }
+
+ /** **/
+ public void setTargetStand(Integer targetStand) {
+ this.targetStand = targetStand;
+ }
+
+ /** **/
+ public String getLeftOrRight() {
+ return this.leftOrRight;
+ }
+
+ /** **/
+ public void setLeftOrRight(String leftOrRight) {
+ this.leftOrRight = leftOrRight;
+ }
+
+ /** **/
+ public String getStandHisId() {
+ return this.standHisId;
+ }
+
+ /** **/
+ public void setStandHisId(String standHisId) {
+ this.standHisId = standHisId;
+ }
+
+ /** **/
+ public Date getCreateTime() {
+ return this.createTime;
+ }
+
+ /** **/
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ /** **/
+ public Date getModifyTime() {
+ return this.modifyTime;
+ }
+
+ /** **/
+ public void setModifyTime(Date modifyTime) {
+ this.modifyTime = modifyTime;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getPid() {
+ return pid;
+ }
+
+ public void setPid(String pid) {
+ this.pid = pid;
+ }
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandItemsCompareHisEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandItemsCompareHisEOPage.java
new file mode 100644
index 00000000..72740ded
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandItemsCompareHisEOPage.java
@@ -0,0 +1,248 @@
+package com.adc.da.slrs.standardSplit.entity;
+
+import com.adc.da.base.page.BasePage;
+
+/**
+ * 功能：SAR_STAND_ITEMS_COMPARE_HIS SarStandItemsCompareHisEOPage
+ * 作者：code generator
+ * 日期： 2020-02-24
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */
+public class SarStandItemsCompareHisEOPage extends BasePage {
+
+ private String id;
+ private String idOperator = "=";
+ private String itemsId;
+ private String itemsIdOperator = "=";
+ private String itemsName;
+ private String itemsNameOperator = "=";
+ private String itemsNum;
+ private String itemsNumOperator = "=";
+ private String itemsText;
+ private String itemsTextOperator = "=";
+ private String itemsDisplayNum;
+ private String itemsDisplayNumOperator = "=";
+ private String targetStand;
+ private String targetStandOperator = "=";
+ private String leftOrRight;
+ private String leftOrRightOperator = "=";
+ private String standHisId;
+ private String standHisIdOperator = "=";
+ private String createTime;
+ private String createTime1;
+ private String createTime2;
+ private String createTimeOperator = "=";
+ private String modifyTime;
+ private String modifyTime1;
+ private String modifyTime2;
+ private String modifyTimeOperator = "=";
+
+ public String getId() {
+ return this.id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getIdOperator() {
+ return this.idOperator;
+ }
+
+ public void setIdOperator(String idOperator) {
+ this.idOperator = idOperator;
+ }
+
+ public String getItemsId() {
+ return this.itemsId;
+ }
+
+ public void setItemsId(String itemsId) {
+ this.itemsId = itemsId;
+ }
+
+ public String getItemsIdOperator() {
+ return this.itemsIdOperator;
+ }
+
+ public void setItemsIdOperator(String itemsIdOperator) {
+ this.itemsIdOperator = itemsIdOperator;
+ }
+
+ public String getItemsName() {
+ return this.itemsName;
+ }
+
+ public void setItemsName(String itemsName) {
+ this.itemsName = itemsName;
+ }
+
+ public String getItemsNameOperator() {
+ return this.itemsNameOperator;
+ }
+
+ public void setItemsNameOperator(String itemsNameOperator) {
+ this.itemsNameOperator = itemsNameOperator;
+ }
+
+ public String getItemsNum() {
+ return this.itemsNum;
+ }
+
+ public void setItemsNum(String itemsNum) {
+ this.itemsNum = itemsNum;
+ }
+
+ public String getItemsNumOperator() {
+ return this.itemsNumOperator;
+ }
+
+ public void setItemsNumOperator(String itemsNumOperator) {
+ this.itemsNumOperator = itemsNumOperator;
+ }
+
+ public String getItemsText() {
+ return this.itemsText;
+ }
+
+ public void setItemsText(String itemsText) {
+ this.itemsText = itemsText;
+ }
+
+ public String getItemsTextOperator() {
+ return this.itemsTextOperator;
+ }
+
+ public void setItemsTextOperator(String itemsTextOperator) {
+ this.itemsTextOperator = itemsTextOperator;
+ }
+
+ public String getItemsDisplayNum() {
+ return this.itemsDisplayNum;
+ }
+
+ public void setItemsDisplayNum(String itemsDisplayNum) {
+ this.itemsDisplayNum = itemsDisplayNum;
+ }
+
+ public String getItemsDisplayNumOperator() {
+ return this.itemsDisplayNumOperator;
+ }
+
+ public void setItemsDisplayNumOperator(String itemsDisplayNumOperator) {
+ this.itemsDisplayNumOperator = itemsDisplayNumOperator;
+ }
+
+ public String getTargetStand() {
+ return this.targetStand;
+ }
+
+ public void setTargetStand(String targetStand) {
+ this.targetStand = targetStand;
+ }
+
+ public String getTargetStandOperator() {
+ return this.targetStandOperator;
+ }
+
+ public void setTargetStandOperator(String targetStandOperator) {
+ this.targetStandOperator = targetStandOperator;
+ }
+
+ public String getLeftOrRight() {
+ return this.leftOrRight;
+ }
+
+ public void setLeftOrRight(String leftOrRight) {
+ this.leftOrRight = leftOrRight;
+ }
+
+ public String getLeftOrRightOperator() {
+ return this.leftOrRightOperator;
+ }
+
+ public void setLeftOrRightOperator(String leftOrRightOperator) {
+ this.leftOrRightOperator = leftOrRightOperator;
+ }
+
+ public String getStandHisId() {
+ return this.standHisId;
+ }
+
+ public void setStandHisId(String standHisId) {
+ this.standHisId = standHisId;
+ }
+
+ public String getStandHisIdOperator() {
+ return this.standHisIdOperator;
+ }
+
+ public void setStandHisIdOperator(String standHisIdOperator) {
+ this.standHisIdOperator = standHisIdOperator;
+ }
+
+ public String getCreateTime() {
+ return this.createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateTime1() {
+ return this.createTime1;
+ }
+
+ public void setCreateTime1(String createTime1) {
+ this.createTime1 = createTime1;
+ }
+
+ public String getCreateTime2() {
+ return this.createTime2;
+ }
+
+ public void setCreateTime2(String createTime2) {
+ this.createTime2 = createTime2;
+ }
+
+ public String getCreateTimeOperator() {
+ return this.createTimeOperator;
+ }
+
+ public void setCreateTimeOperator(String createTimeOperator) {
+ this.createTimeOperator = createTimeOperator;
+ }
+
+ public String getModifyTime() {
+ return this.modifyTime;
+ }
+
+ public void setModifyTime(String modifyTime) {
+ this.modifyTime = modifyTime;
+ }
+
+ public String getModifyTime1() {
+ return this.modifyTime1;
+ }
+
+ public void setModifyTime1(String modifyTime1) {
+ this.modifyTime1 = modifyTime1;
+ }
+
+ public String getModifyTime2() {
+ return this.modifyTime2;
+ }
+
+ public void setModifyTime2(String modifyTime2) {
+ this.modifyTime2 = modifyTime2;
+ }
+
+ public String getModifyTimeOperator() {
+ return this.modifyTimeOperator;
+ }
+
+ public void setModifyTimeOperator(String modifyTimeOperator) {
+ this.modifyTimeOperator = modifyTimeOperator;
+ }
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java
index f2e0da79..bad1b3d0 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java
@@ -46,4 +46,6 @@ public interface SarFileSplitItemsEOService {
List getSheetTableList);
void combineItems(String ids);
+
+ List queryByList2(SarFileSplitItemsEOPage page);
}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarItemsCompareHisEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarItemsCompareHisEOService.java
new file mode 100644
index 00000000..56a96786
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarItemsCompareHisEOService.java
@@ -0,0 +1,10 @@
+package com.adc.da.slrs.standardSplit.service;
+
+import com.adc.da.slrs.standardSplit.entity.SarItemsCompareHisEO;
+
+public interface SarItemsCompareHisEOService {
+
+ int insertSelective(SarItemsCompareHisEO sarItemsCompareHisEO);
+
+ void deleteByStandHisId(String id);
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandCompareHisEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandCompareHisEOService.java
new file mode 100644
index 00000000..1eb72339
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandCompareHisEOService.java
@@ -0,0 +1,25 @@
+package com.adc.da.slrs.standardSplit.service;
+
+import com.adc.da.slrs.standardSplit.entity.SarStandCompareHisEO;
+import com.adc.da.slrs.standardSplit.entity.SarStandCompareHisEOPage;
+import java.util.List;
+import java.util.Map;
+
+public interface SarStandCompareHisEOService {
+
+ List standCompareHisPage(SarStandCompareHisEOPage page);
+
+ List queryByList(SarStandCompareHisEOPage page);
+
+ SarStandCompareHisEO selectByPrimaryKey(String id);
+
+ int insertSelective(SarStandCompareHisEO sarStandCompareHisEO);
+
+ int updateByPrimaryKeySelective(SarStandCompareHisEO sarStandCompareHisEO);
+
+ int deleteByPrimaryKey(String id);
+
+ Map clauseComparison(String oldItemId, String newItemId, String standHisId);
+
+ Map fullTextComparison(String leftStandard, String rightStandard) throws Exception;
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandItemsCompareHisEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandItemsCompareHisEOService.java
new file mode 100644
index 00000000..d49fe7b7
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandItemsCompareHisEOService.java
@@ -0,0 +1,23 @@
+package com.adc.da.slrs.standardSplit.service;
+
+import com.adc.da.slrs.standardSplit.entity.SarStandItemsCompareHisEO;
+import com.adc.da.slrs.standardSplit.entity.SarStandItemsCompareHisEOPage;
+import java.util.List;
+
+public interface SarStandItemsCompareHisEOService {
+
+ int insertSelective(SarStandItemsCompareHisEO var);
+
+ void deleteByStandHisId(String id);
+
+ List queryByPage(SarStandItemsCompareHisEOPage page);
+
+ List queryByList(SarStandItemsCompareHisEOPage page);
+
+ SarStandItemsCompareHisEO selectByPrimaryKey(String id);
+
+ void updateByPrimaryKeySelective(SarStandItemsCompareHisEO page);
+
+ void deleteByPrimaryKey(String id);
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java
index 427b113e..06d92dfa 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java
@@ -940,6 +940,11 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
}
}
+ @Override
+ public List queryByList2(SarFileSplitItemsEOPage page) {
+ return sarFileSplitItemsEODao.queryByList2(page);
+ }
+
public void changeInfos (StringBuilder resultContent,String reaultItemId,List delMenuIds,List delIds,List resultValList) {
//1.更新最终合并的条款内容
if (resultContent != null) {
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarItemsCompareHisEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarItemsCompareHisEOServiceImpl.java
new file mode 100644
index 00000000..64aa7e76
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarItemsCompareHisEOServiceImpl.java
@@ -0,0 +1,30 @@
+package com.adc.da.slrs.standardSplit.service.impl;
+
+import com.adc.da.slrs.standardSplit.dao.SarItemsCompareHisEODao;
+import com.adc.da.slrs.standardSplit.entity.*;
+import com.adc.da.slrs.standardSplit.service.SarItemsCompareHisEOService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
+public class SarItemsCompareHisEOServiceImpl implements SarItemsCompareHisEOService {
+ private static final Logger logger = LoggerFactory.getLogger(SarItemsCompareHisEOServiceImpl.class);
+
+ @Autowired
+ private SarItemsCompareHisEODao sarItemsCompareHisEODao;
+
+ @Override
+ public int insertSelective(SarItemsCompareHisEO sarItemsCompareHisEO) {
+ return sarItemsCompareHisEODao.insertSelective(sarItemsCompareHisEO);
+ }
+
+ @Override
+ public void deleteByStandHisId(String id) {
+ sarItemsCompareHisEODao.deleteByStandHisId(id);
+ }
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java
new file mode 100644
index 00000000..1033d3be
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java
@@ -0,0 +1,433 @@
+package com.adc.da.slrs.standardSplit.service.impl;
+
+import com.adc.da.person.service.IPersonCollectEOService;
+import com.adc.da.slrs.standardSplit.dao.SarStandAttrDetailsEODao;
+import com.adc.da.slrs.standardSplit.dao.SarStandCompareHisEODao;
+import com.adc.da.slrs.standardSplit.entity.*;
+import com.adc.da.slrs.standardSplit.service.*;
+import com.adc.da.sys.common.SelectionResult;
+import com.adc.da.sys.constant.ValidFlagEnum;
+import com.adc.da.sys.util.LoginUserUtil;
+import com.adc.da.sys.util.UUIDUtils;
+import com.adc.da.utils.treetool.Tree;
+import com.adc.da.utils.treetool.TreeNode;
+import com.adc.da.utils.util.CompHanLPUtils;
+import com.adc.da.utils.util.DiffUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import java.text.NumberFormat;
+import java.util.*;
+
+@Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
+public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOService {
+ private static final Logger logger = LoggerFactory.getLogger(SarStandCompareHisEOServiceImpl.class);
+
+ @Autowired
+ private SarStandCompareHisEODao dao;
+ @Autowired
+ private SarStandAttrDetailsEODao sarStandAttrDetailsEODao;
+ @Autowired
+ private IPersonCollectEOService personCollectEOService;
+ @Autowired
+ private SarStandCompareHisEODao sarStandCompareHisEODao;
+ @Autowired
+ private SarFileSplitItemsValEOService sarFileSplitItemsValEOService;
+ @Autowired
+ private SarFileSplitItemsEOService sarFileSplitItemsEOService;
+ @Autowired
+ private SarItemsCompareHisEOService sarItemsCompareHisEOService;
+ @Autowired
+ private SarFileSplitMenuEOService sarFileSplitMenuEOService;
+ @Autowired
+ private SarFileSplitInfoEOService sarFileSplitInfoEOService;
+ @Autowired
+ private SarStandItemsCompareHisEOService sarStandItemsCompareHisEOService;
+
+ @Override
+ public List standCompareHisPage(SarStandCompareHisEOPage page) {
+ if(StringUtils.isNotBlank(page.getShunxu())){
+ String sql = "ORDER BY CREATE_TIME "+page.getShunxu();
+ page.setSql(sql);
+ }else{
+ String sql = "ORDER BY CREATE_TIME DESC";
+ page.setSql(sql);
+ }
+ Integer rowCount = dao.queryByCount(page);
+ page.getPager().setRowCount(rowCount);
+ List rows = dao.queryByPage(page);
+ if (rows != null && !rows.isEmpty()) {
+ for (SarStandCompareHisEO infoEO : rows) {
+ String collectId = personCollectEOService.queryCollectByUserAndId(infoEO.getId());
+ infoEO.setCollectId(collectId);
+ if (StringUtils.isNotBlank(infoEO.getOldFileType())) {
+ List getList = sarStandAttrDetailsEODao.selectFileFieldForSel(infoEO.getOldFileType());
+ if (getList != null && !getList.isEmpty()) {
+ infoEO.setOldFileTypeShow(getList.get(0).getLabel());
+ } else {
+ infoEO.setOldFileTypeShow(null);
+ }
+ }
+ if (StringUtils.isNotBlank(infoEO.getNewFileType())) {
+ List getList = sarStandAttrDetailsEODao.selectFileFieldForSel(infoEO.getNewFileType());
+ if (getList != null && !getList.isEmpty()) {
+ infoEO.setNewFileTypeShow(getList.get(0).getLabel());
+ } else {
+ infoEO.setNewFileTypeShow(null);
+ }
+ }
+ }
+ }
+ return rows;
+ }
+
+ @Override
+ public List queryByList(SarStandCompareHisEOPage page) {
+ return sarStandCompareHisEODao.queryByList(page);
+ }
+
+ @Override
+ public SarStandCompareHisEO selectByPrimaryKey(String id) {
+ return sarStandCompareHisEODao.selectByPrimaryKey(id);
+ }
+
+ @Override
+ public int insertSelective(SarStandCompareHisEO sarStandCompareHisEO) {
+ return sarStandCompareHisEODao.insertSelective(sarStandCompareHisEO);
+ }
+
+ @Override
+ public int updateByPrimaryKeySelective(SarStandCompareHisEO sarStandCompareHisEO) {
+ return sarStandCompareHisEODao.updateByPrimaryKeySelective(sarStandCompareHisEO);
+ }
+
+ @Override
+ public int deleteByPrimaryKey(String id) {
+ return sarStandCompareHisEODao.deleteByPrimaryKey(id);
+ }
+
+ @Override
+ public Map clauseComparison(String oldItemId, String newItemId, String standHisId) {
+ Map resultMap = new HashMap();
+ String oldTxt = "";
+ SarFileSplitItemsValEOPage oldPage = new SarFileSplitItemsValEOPage();
+ oldPage.setItemId(oldItemId);
+ oldPage.setType("TEXT");
+ oldPage.setOrderBy("DISPLAY_SEQ,ID");
+ List oldList = sarFileSplitItemsValEOService.queryByList(oldPage);
+ if(oldList!=null && !oldList.isEmpty()){
+ for(int i = 1;i<=oldList.size();i++){
+ if(i==oldList.size()) {
+ oldTxt += oldList.get(i-1).getItemContent();
+ }else{
+ oldTxt += oldList.get(i-1).getItemContent() + "\n";
+ }
+ }
+ }
+ String newTxt = "";
+ SarFileSplitItemsValEOPage newPage = new SarFileSplitItemsValEOPage();
+ newPage.setItemId(newItemId);
+ newPage.setType("TEXT");
+ newPage.setOrderBy("DISPLAY_SEQ,ID");
+ List newList = sarFileSplitItemsValEOService.queryByList(newPage);
+ if(newList!=null && !newList.isEmpty()){
+ for(int i = 1;i<=newList.size();i++){
+ if(i==newList.size()) {
+ newTxt += newList.get(i-1).getItemContent();
+ }else{
+ newTxt += newList.get(i-1).getItemContent() + "\n";
+ }
+ }
+ }
+ String similarityDegree="";
+ double similarity = 100.00;
+ if(!StringUtils.isNotBlank(oldTxt.trim()) && !StringUtils.isNotBlank(newTxt.trim())){
+ similarityDegree = "100.00";
+ }else if(StringUtils.isNotBlank(oldTxt.trim()) && StringUtils.isNotBlank(newTxt.trim())){
+ similarity = CompHanLPUtils.findSimilarity(oldTxt.trim(), newTxt.trim());
+ NumberFormat nf = java.text.NumberFormat.getPercentInstance();
+ //nf.setMaximumIntegerDigits(2);//小数点前保留几位
+ nf.setMinimumFractionDigits(2);// 小数点后保留几位
+ similarityDegree = nf.format(similarity);
+ }else{
+ similarity = 0.00;
+ similarityDegree = "0.00";
+ }
+ resultMap.put("similarityDegree",similarityDegree);
+ List leftString = new ArrayList<>();
+ List rightString = new ArrayList<>();
+ if(similarity >= 0.6){
+ DiffUtils diffUtils = new DiffUtils();
+ List htmlDiffStr = diffUtils.getHtmlDiffStr(oldTxt.trim(), newTxt.trim());
+ List stringList1 = Arrays.asList(htmlDiffStr.get(0).split("
"));
+ for(String left : stringList1){
+ StringBuilder stringBuilder = new StringBuilder(left);
+ stringBuilder.append("");
+ }
+ leftString.add(stringBuilder.toString());
+ }
+ List stringList2 = Arrays.asList(htmlDiffStr.get(1).split("
"));
+ for(String right : stringList2){
+ StringBuilder stringBuilder = new StringBuilder(right);
+ stringBuilder.append("
");
+ if(similarity <0.75 && right.indexOf("");
+ }else{
+ stringBuilder.insert(0,"");
+ }
+ rightString.add(stringBuilder.toString());
+ }
+ resultMap.put("leftString",leftString);
+ resultMap.put("rightString",rightString);
+ }else{
+ String oldTxtTemp = oldTxt.replace("\n", "
");
+ List stringList1 = Arrays.asList(oldTxtTemp.split("
"));
+ for(String left : stringList1){
+ StringBuilder stringBuilder = new StringBuilder(left);
+ stringBuilder.append("
");
+ stringBuilder.insert(0,"");
+ leftString.add(stringBuilder.toString());
+ }
+ resultMap.put("leftString",leftString);
+ String newTxtTemp = newTxt.replace("\n", "
");
+ List stringList2 = Arrays.asList(newTxtTemp.split("
"));
+ for(String right : stringList2){
+ StringBuilder stringBuilder = new StringBuilder(right);
+ stringBuilder.append("
");
+ stringBuilder.insert(0,"");
+ rightString.add(stringBuilder.toString());
+ }
+ resultMap.put("rightString",rightString);
+ }
+ //往条款比对历史表中添加数据
+ if(standHisId != null && !standHisId.isEmpty()){
+ SarFileSplitItemsEO leftEo = sarFileSplitItemsEOService.selectByPrimaryKey(oldItemId);
+ SarFileSplitItemsEO rightEo = sarFileSplitItemsEOService.selectByPrimaryKey(newItemId);
+ String leftItemsText = "";
+ if(leftString != null && !leftString.isEmpty()){
+ for(String left : leftString){
+ leftItemsText += left;
+ }
+ }
+ String rightItemsText = "";
+ if(rightString != null && !rightString.isEmpty()){
+ for(String right : rightString){
+ rightItemsText += right;
+ }
+ }
+ SarItemsCompareHisEO sarItemsCompareHisEO = new SarItemsCompareHisEO();
+ sarItemsCompareHisEO.setId(UUIDUtils.randomUUID20());
+ sarItemsCompareHisEO.setOldItemsId(leftEo.getId());
+ sarItemsCompareHisEO.setOldItemsName(leftEo.getItemsName());
+ sarItemsCompareHisEO.setOldItemsNum(leftEo.getItemsNum());
+ sarItemsCompareHisEO.setOldItemsText(leftItemsText);
+ sarItemsCompareHisEO.setNewItemsId(rightEo.getId());
+ sarItemsCompareHisEO.setNewItemsName(rightEo.getItemsName());
+ sarItemsCompareHisEO.setNewItemsNum(rightEo.getItemsNum());
+ sarItemsCompareHisEO.setNewItemsText(rightItemsText);
+ sarItemsCompareHisEO.setStandHisId(standHisId);
+ sarItemsCompareHisEO.setSimilarityDegree(similarityDegree);
+ sarItemsCompareHisEO.setCreateUser(LoginUserUtil.getUserId());
+ sarItemsCompareHisEO.setModifyUser(LoginUserUtil.getUserId());
+ sarItemsCompareHisEO.setModifyTime(new Date());
+ sarItemsCompareHisEO.setCreateTime(new Date());
+ sarItemsCompareHisEOService.insertSelective(sarItemsCompareHisEO);
+ }
+ return resultMap;
+ }
+
+ @Override
+ public Map
fullTextComparison(String leftStandard, String rightStandard) throws Exception{
+ Map resultMap = new HashMap();
+ List> leftMapList = fullTextComparePackageData(leftStandard);
+ List> rightMapList = fullTextComparePackageData(rightStandard);
+ List> resLeftMapList = null;
+ List> resRightMapList = null;
+ if(leftMapList != null && !leftMapList.isEmpty() && rightMapList != null && !rightMapList.isEmpty()){
+ //双重循环找到相似度最高的条款做关联
+ for(int i=0;i=0.6 && compareSimilarity>
+ **/
+ public List> writeResultHtml (List> resMapList) {
+ List> resultMapList = new ArrayList<>();
+ for(Map resMap : resMapList){
+ Map map = new HashMap<>();
+ StringBuilder stringBuilder = new StringBuilder();
+ stringBuilder.append(""+resMap.get("itemsNum").toString()+" "+resMap.get("itemsName").toString()
+ );
+ String itemsTxt = resMap.get("itemsText").toString();
+ stringBuilder.append(itemsTxt);
+ stringBuilder.append("
");
+ map.put("resultHtml",stringBuilder.toString());
+ map.put("targetStand",(Integer)resMap.get("targetStand"));
+ map.put("itemsId",resMap.get("itemsId").toString());
+ resultMapList.add(map);
+ }
+ return resMapList;
+ }
+
+ /**
+ * @Author yuzhong
+ * @Description 保存比对历史
+ * @Date 17:24 2020/2/24
+ * @Param [sarStandCompareHisEO]
+ * @return void
+ **/
+ @Async
+ public void addStandCompareHis(String leftStandId,String rightStandId,String compareType,
+ List> resLeftMapList,List> resRightMapList) throws Exception{
+ SarFileSplitInfoEO leftInfo = sarFileSplitInfoEOService.selectByPrimaryKey(leftStandId);
+ SarFileSplitInfoEO rightInfo = sarFileSplitInfoEOService.selectByPrimaryKey(rightStandId);
+ //保存标准比对历史表数据
+ SarStandCompareHisEO sarStandCompareHisEO = new SarStandCompareHisEO();
+ String id = UUIDUtils.randomUUID20();
+ sarStandCompareHisEO.setId(id);
+ sarStandCompareHisEO.setOldStandId(leftStandId);
+ sarStandCompareHisEO.setNewStandId(rightStandId);
+ sarStandCompareHisEO.setOldFileType(leftInfo.getFileType());
+ sarStandCompareHisEO.setNewFileType(rightInfo.getFileType());
+ sarStandCompareHisEO.setOldStandName(leftInfo.getStandNameSplit());
+ sarStandCompareHisEO.setNewStandName(rightInfo.getStandNameSplit());
+ sarStandCompareHisEO.setOldStandNum(leftInfo.getStandNumSplit());
+ sarStandCompareHisEO.setNewStandNum(rightInfo.getStandNumSplit());
+ sarStandCompareHisEO.setOldSarType(leftInfo.getSarType());
+ sarStandCompareHisEO.setNewSarType(rightInfo.getSarType());
+ sarStandCompareHisEO.setCreateTime(new Date());
+ sarStandCompareHisEO.setModifyTime(new Date());
+ sarStandCompareHisEO.setCreateUser(LoginUserUtil.getUserId());
+ sarStandCompareHisEO.setModifyUser(LoginUserUtil.getUserId());
+ sarStandCompareHisEO.setCompareType(compareType);
+ dao.insertSelective(sarStandCompareHisEO);
+ //保存标准的所有条款比对的历史数据
+ if(resLeftMapList!=null && !resLeftMapList.isEmpty()) {
+ setStandCompareHisEO(resLeftMapList, id, "LEFT");
+ }
+ if(resRightMapList!=null && !resRightMapList.isEmpty()) {
+ setStandCompareHisEO(resRightMapList, id, "RIGHT");
+ }
+ }
+
+ public void setStandCompareHisEO(List> mapList,String id,String leftOrRight) throws Exception{
+ for(int i=0;i>
+ **/
+ public List> fullTextComparePackageData(String standardId) throws Exception{
+ List> mapList = new ArrayList>();
+ //调用查询条款接口
+ SarFileSplitItemsEOPage sarFileSplitItemsEOPage = new SarFileSplitItemsEOPage();
+ sarFileSplitItemsEOPage.setInfoId(standardId);
+ sarFileSplitItemsEOPage.setValidFlag(String.valueOf(ValidFlagEnum.VALID_TRUE.getValue()));
+ sarFileSplitItemsEOPage.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc");
+
+ if(com.adc.da.util.utils.StringUtils.isNotEmpty(sarFileSplitItemsEOPage.getMenuId())) {
+ List sarFileSplitMenuEOList = sarFileSplitMenuEOService.queryByList(new SarFileSplitMenuEOPage());
+ Tree tree = new Tree<>(sarFileSplitMenuEOList);
+ TreeNode treeNode = tree.getTreeNode(sarFileSplitItemsEOPage.getMenuId());
+
+ List menuIds = new ArrayList<>();
+ menuIds.add(treeNode.getNodeId());
+ for (TreeNode node : treeNode.getAllChildren()) {
+ menuIds.add(node.getNodeId());
+ }
+ sarFileSplitItemsEOPage.setMenuIdList(menuIds);
+ }
+
+
+ List itemList = sarFileSplitItemsEOService.queryByList2(sarFileSplitItemsEOPage);
+ if(itemList != null && !itemList.isEmpty()){
+ for(SarFileSplitItemsEO sarFileSplitItemsEO : itemList) {
+ Map map = new HashMap();
+ map.put("itemsNum",sarFileSplitItemsEO.getItemsNum());
+ map.put("itemsName",sarFileSplitItemsEO.getItemsName());
+ map.put("itemsId",sarFileSplitItemsEO.getId());
+ //（内容1\n内容2\n格式）
+ String txt = "";
+ //调用条款内容详情表查询条款内容
+ SarFileSplitItemsValEOPage sarFileSplitItemsValEOPage = new SarFileSplitItemsValEOPage();
+ sarFileSplitItemsValEOPage.setItemId(sarFileSplitItemsEO.getId());
+ sarFileSplitItemsValEOPage.setValidFlag(String.valueOf(ValidFlagEnum.VALID_TRUE.getValue()));
+ sarFileSplitItemsValEOPage.setType("TEXT");
+ List leftValList = sarFileSplitItemsValEOService.queryByList(sarFileSplitItemsValEOPage);
+ if(leftValList != null && !leftValList.isEmpty()){
+ for(SarFileSplitItemsValEO sarFileSplitItemsValEO : leftValList){
+ txt += ""+sarFileSplitItemsValEO.getItemContent()+"
";
+ }
+// txt = txt.substring(0,txt.length() - 1);
+ }
+ map.put("itemsText",txt);
+ map.put("targetStand",null);
+ map.put("menuId",sarFileSplitItemsEO.getMenuId());
+ mapList.add(map);
+ }
+ }
+ return mapList;
+ }
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandItemsCompareHisEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandItemsCompareHisEOServiceImpl.java
new file mode 100644
index 00000000..c8fce83f
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandItemsCompareHisEOServiceImpl.java
@@ -0,0 +1,59 @@
+package com.adc.da.slrs.standardSplit.service.impl;
+
+import com.adc.da.slrs.standardSplit.dao.SarStandItemsCompareHisEODao;
+import com.adc.da.slrs.standardSplit.entity.SarStandItemsCompareHisEO;
+import com.adc.da.slrs.standardSplit.entity.SarStandItemsCompareHisEOPage;
+import com.adc.da.slrs.standardSplit.service.SarStandCompareHisEOService;
+import com.adc.da.slrs.standardSplit.service.SarStandItemsCompareHisEOService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
+public class SarStandItemsCompareHisEOServiceImpl implements SarStandItemsCompareHisEOService {
+ private static final Logger logger = LoggerFactory.getLogger(SarStandItemsCompareHisEOServiceImpl.class);
+
+ @Autowired
+ private SarStandItemsCompareHisEODao sarStandItemsCompareHisEODao;
+
+ @Override
+ public int insertSelective(SarStandItemsCompareHisEO var) {
+ return sarStandItemsCompareHisEODao.insertSelective(var);
+ }
+
+ @Override
+ public void deleteByStandHisId(String id) {
+ sarStandItemsCompareHisEODao.deleteByStandHisId(id);
+ }
+
+ @Override
+ public List queryByPage(SarStandItemsCompareHisEOPage page) {
+ return sarStandItemsCompareHisEODao.queryByPage(page);
+ }
+
+ @Override
+ public List queryByList(SarStandItemsCompareHisEOPage page) {
+ return sarStandItemsCompareHisEODao.queryByList(page);
+ }
+
+ @Override
+ public SarStandItemsCompareHisEO selectByPrimaryKey(String id) {
+ return sarStandItemsCompareHisEODao.selectByPrimaryKey(id);
+ }
+
+ @Override
+ public void updateByPrimaryKeySelective(SarStandItemsCompareHisEO page) {
+ sarStandItemsCompareHisEODao.updateByPrimaryKeySelective(page);
+ }
+
+ @Override
+ public void deleteByPrimaryKey(String id) {
+ sarStandItemsCompareHisEODao.deleteByPrimaryKey(id);
+ }
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/vo/MarkTextVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/vo/MarkTextVO.java
new file mode 100644
index 00000000..14b9bd6e
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/vo/MarkTextVO.java
@@ -0,0 +1,29 @@
+package com.adc.da.slrs.standardSplit.vo;
+
+/**
+ * @Description:
+ * @Author: yangxuenan
+ * date: 2020/3/24 15:32
+ */
+public class MarkTextVO {
+
+ private int startIndex;
+
+ private int endIndex;
+
+ public int getStartIndex() {
+ return startIndex;
+ }
+
+ public void setStartIndex(int startIndex) {
+ this.startIndex = startIndex;
+ }
+
+ public int getEndIndex() {
+ return endIndex;
+ }
+
+ public void setEndIndex(int endIndex) {
+ this.endIndex = endIndex;
+ }
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/CompHanLPUtils.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/CompHanLPUtils.java
new file mode 100644
index 00000000..6e5dae4a
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/CompHanLPUtils.java
@@ -0,0 +1,265 @@
+package com.adc.da.utils.util;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.extra.tokenizer.Result;
+import cn.hutool.extra.tokenizer.TokenizerEngine;
+import cn.hutool.extra.tokenizer.TokenizerUtil;
+import cn.hutool.extra.tokenizer.Word;
+import cn.hutool.extra.tokenizer.engine.hanlp.HanLPEngine;
+import cn.hutool.extra.tokenizer.engine.jieba.JiebaEngine;
+import com.hankcs.hanlp.HanLP;
+import lombok.extern.slf4j.Slf4j;
+import java.io.IOException;
+import java.io.StringReader;
+import java.text.NumberFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import org.jsoup.Jsoup;
+import org.wltea.analyzer.core.IKSegmenter;
+import org.wltea.analyzer.core.Lexeme;
+
+
+@Slf4j
+public class CompHanLPUtils {
+
+
+ /**
+ * 通过Ik 进行将句子分词
+ * @param text
+ * @return
+ */
+ public static Vector participleIk(String text) {
+ //对输入进行分词
+ Vector str = new Vector<>();
+ try {
+ StringReader reader = new StringReader(text);
+ //当为true时，分词器进行最大词长切分
+ IKSegmenter ik = new IKSegmenter(reader, true);
+ Lexeme lexeme = null;
+ while ((lexeme = ik.next()) != null) {
+ str.add(lexeme.getLexemeText());
+ }
+ if (str.size() == 0) {
+ return null;
+ }
+ //分词后
+ log.info("str分词后:" + str);
+ } catch (IOException e) {
+ log.error(e.getMessage());
+ }
+ return str;
+ }
+
+
+ /**
+ * 结巴分词
+ * @param text
+ * @return
+ */
+ public static Vector participleJieBa(String text) {
+ JiebaEngine engine = new JiebaEngine();
+ Result results = engine.parse(text);
+ //输出：这 两个 方法 的 区别 在于 返回 值
+ String result = CollUtil.join((Iterator) results, ",");
+ return new Vector<>(Arrays.asList(result.split(",")));
+ }
+
+
+ /**
+ * 中文分词
+ * @param text
+ * @return
+ */
+ public static Vector participleChinese(String text){
+ //自动根据用户引入的分词库的jar来自动选择使用的引擎
+ TokenizerEngine engine = TokenizerUtil.createEngine();
+ //解析文本
+ //String text = "这两个方法的区别在于返回值";
+ Result results = engine.parse(text);
+ //输出：这 两个 方法 的 区别 在于 返回 值
+ String result = CollUtil.join((Iterator)results, ",");
+ return new Vector<>(Arrays.asList(result.split(",")));
+ }
+
+ /**
+ * 采用 HanLP 进行自定义分词
+ */
+ public static Vector participleHanLP(String text){
+ TokenizerEngine engine = new HanLPEngine();
+ //解析文本
+ //String text = "这两个方法的区别在于返回值";
+ Result results = engine.parse(text);
+ //输出：这 两个 方法 的 区别 在于 返回 值
+ String result = CollUtil.join((Iterator)results, ",");
+ return new Vector<>(Arrays.asList(result.split(",")));
+ }
+
+
+
+ /**
+ * Java利用hanlp完成语句相似度分析
+ * @param sentenceOne
+ * @param sentenceTwo
+ * @return
+ */
+ public static double findSimilarity(String sentenceOne, String sentenceTwo) {
+ List sentOneWords = getSplitWords(sentenceOne);
+ List sentTwoWords = getSplitWords(sentenceTwo);
+ List allWords = mergeList(sentOneWords, sentTwoWords);
+ int[] statisticOne = statistic(allWords, sentOneWords);
+ int[] statisticTwo = statistic(allWords, sentTwoWords);
+ double dividend = 0;
+ double divisor1 = 0;
+ double divisor2 = 0;
+ int length = statisticOne.length;
+ for (int i = 0; i < length; i++) {
+ dividend += statisticOne[i] * statisticTwo[i];
+ divisor1 += Math.pow(statisticOne[i], 2);
+ divisor2 += Math.pow(statisticTwo[i], 2);
+ }
+ return dividend / (Math.sqrt(divisor1) * Math.sqrt(divisor2));
+ }
+
+
+ private static int[] statistic(List allWords, List sentWords) {
+ int[] result = new int[allWords.size()];
+ int size = allWords.size();
+ for (int i = 0; i < size; i++) {
+ result[i] = Collections.frequency(sentWords, allWords.get(i));
+ }
+ return result;
+ }
+
+
+ /**
+ * 去重
+ * @param listOne
+ * @param listTwo
+ * @return
+ */
+ private static List mergeList(List listOne, List listTwo) {
+ List result = new ArrayList<>();
+ result.addAll(listOne);
+ result.addAll(listTwo);
+ return result.stream().distinct().collect(Collectors.toList());
+ }
+
+
+ /**
+ * 过滤标签
+ * @param sentence
+ * @return
+ */
+ private static List getSplitWords(String sentence) {
+ // 去除掉html标签
+ sentence = Jsoup.parse(sentence.replace(" ","")).body().text();
+ // 标点符号会被单独分为一个Term，去除之
+ return HanLP.segment(sentence).stream().map(a -> a.word).filter(s -> !"`~!@#$^&*()=|{}':;',\\[\\].<>/?~！@#￥……&*（）——|{}【】‘；：”“'。，、？ ".contains(s)).collect(Collectors.toList());
+ }
+
+
+
+
+ public static void main(String[] args) {
+ String str1="6转向系\n" +
+ "6.1汽车（三轮汽车除外）的方向盘应设置于左侧，其他机动车的方向盘不得设置于右侧；专项作业车、教练车按需要可设置左右两个方向盘。有驾驶室的正三轮摩托车如使用方向盘转向，则方向盘中心立柱距车辆纵向中心平面的水平距离应小于等于200 mm;其他摩托车不得使用方向盘转向。\n" +
+ "6.2机动车的方向盘（或方向把）应转动灵活，操纵方便，无卡滞现象。机动车应设置转向限位装置。转向系统在任何操作位置上，不得与其他部件有干涉现象。\n" +
+ "6.3机动车（摩托车、三轮汽车、手扶拖拉机运输机组除外）正常行驶时，转向轮转向后应有一定的回正能力（允许有残余角），以使机动车具有稳定的直线行驶能力。\n" +
+ "6.4机动车方向盘的最大自由转动量应小于或等于：\n" +
+ "a) 最大设计车速大于或等于100 km/h 的机动车：15°\n" +
+ "b) 三轮汽车：35°；\n" +
+ "c) 其他机动车：25° 。\n" +
+ "6.5汽车（三轮汽车除外）应具有适度的不足转向特性。\n" +
+ "6.6三轮汽车、摩托车的转向轮向左或向右转角应小于等于：\n" +
+ "a）\t三轮汽车、三轮摩托车、正三轮轻便摩托车:45°;\n" +
+ "6）\t\t两轮普通摩托车、两轮轻便摩托车:48°。\n" +
+ "6.6机动车在平坦、硬实、干燥和清洁的道路上行驶不应跑偏，其方向盘（或方向把）不应有摆振、路感不灵或其他异常现象。\n" +
+ "6.8机动车在平坦、硬实、干燥和清洁的水泥或沥青道路上行驶，以10 km/h的速度在5 s之内沿螺旋线从直线行驶过渡到外圆直径为25 m的车辆通道圆行驶，施加于方向盘外缘的最大切向力应小于等于245 N。\n" +
+ "6.9专用校车应采用转向助力装置;其他机动车转向轴最大设计轴荷大于4 000 kg时，也应采用转向助力装置。装有转向助力装置的机动车，转向时其转向助力功能不得出现时有时无的现象，且转向助力装置失效时仍应具有用方向盘控制机动车的能力。装有电动转向助力装置的汽车，在产品使用说明书规定的正常使用状态下，应保证转向助力装置的电能供应。\n" +
+ "6.10汽车和汽车列车（不计具有作业功能的专用装置的突出部分）、轮式拖拉机运输机组应能在同一个车辆通道圆内通过，车辆通道圆的外圆直径认为25.00 m，车辆通道圆的内圆直径D2为10.60 m。 汽车和汽车列车、轮式拖拉机运输机组由直线行驶过渡到上述圆周运动时，任何部分超出直线行驶时的 车辆外侧面垂直面的值（外摆值）应小于等于0.80 m（对铰接客车和铰接式无轨电车外摆值应小于等于 1.20 m），其试验方法见GB 1589。\n" +
+ "6.11汽车（三轮汽车除外）的车轮定位应与该车型的技术要求一致。对前轴采用非独立悬架的汽车（前轴采用双转向轴时除外），其转向轮的横向侧滑量，用侧滑台检验时侧滑量值应在±5 m/km之间。\n" +
+ "6.12转向节及臂，转向横、直拉杆及球销不得有裂纹和损伤，并且转向球销不应松旷。对机动车进行改装或修理时横、直拉杆不得拼焊。\n" +
+ "6.13三轮汽车、摩托车的前减振器、上下联板和方向把不应有变形和裂损。\n";
+ String str2="6转向系\n" +
+ "6.1汽车（三轮汽车除外）的方向盘应设置于左侧，其他机动车的方向盘不应设置于右侧；专项作业车、教练车按需要可设置左右两个方向盘。装有两个后轮、有驾驶室的正三轮摩托车如使用方向盘转向，则方向盘中心立柱距车辆纵向中心平面的水平距离应小于或等于200 mm ；其他摩托车不应使用方向盘转向。\n" +
+ "6.2机动车的方向盘（或方向把）应转动灵活，无卡滞现象。机动车应设置转向限位装置。转向系统在任何操作位置上，不应与其他部件有干涉现象。\n" +
+ "6.3机动车（摩托车、三轮汽车、手扶拖拉机运输机组除外〉正常行驶时，转向轮转向后应有一定的回正能力（允许有残余角），以使机动车具有稳定的直线行驶能力0\n" +
+ "6.4机动车方向盘的最大自由转动量应小于或等于：\n" +
+ "a) 最大设计车速大于或等于100 km/h 的机动车：15°\n" +
+ "b) 三轮汽车：35°；\n" +
+ "c) 其他机动车：25° 。\n" +
+ "6.5汽车（三轮汽车除外）应具有适度的不足转向特性。\n" +
+ "6.6三轮汽车、摩托车的转向轮向左或向右转角应小于或等于：\n" +
+ "a) 三轮汽车、三轮摩托车、正三轮轻便摩托车：45°；\n" +
+ "b）两轮普通摩托车、两轮轻便摩托车：48°0\n" +
+ "6.7机动车在平坦、硬实、干燥和清洁的道路上行驶不应跑偏，其方向盘（或方向把）不应有摆振等异常现象。\n" +
+ "6.8机动车在平坦、硬实、干燥和清洁的水泥或沥青道路上行驶，以10 km/h 的速度在5 s 之内沿螺旋线从直线行驶过渡到外圆直径为25m 的车辆通道圆行驶，施加于方向盘外缘的最大切向力应小于或等于245 N。\n" +
+ "6.9汽车（三轮汽车除外）的车轮定位应与该车型的技术要求一致。对前轴采用非独立悬架的汽车（前轴采用双转向轴时除外），其转向轮的横向侧滑量，用侧滑台检验时侧滑量值应小于或等于5 m/km。\n" +
+ "6.10 专用校车应采用转向助力装置；其他机动车转向轴最大设计轴荷大于4 000 kg 时，也应采用转向助力装置。装有转向助力装置的机动车，转向时其转向助力功能不应出现时有时无的现象，且转向助力装置失效时仍应具有用方向盘控制机动车的能力。\n" +
+ "6.11转向节及臂，转向横、直拉杆及球销应连接可靠，且不应有裂纹和损伤，并且转向球销不应松旷。对机动车进行改装或修理时横、直拉杆不应拼焊。\n" +
+ "6.12三轮汽车、摩托车的前减振器、上下联板和方向把不应有变形和裂损。";
+ String str3="\n" +
+ "5车辆识别代号的标示位置\n" +
+ "5.1每辆车辆都应具有唯一的车辆识别代号，并永久保持地标示在车辆上，同一车辆上标示的所有的 车辆识别代号的字码构成与排列顺序应相同。除第9章规定的情况外，不得对已标示的车辆识别代号 进行变更。\n" +
+ "5.2车辆应在产品标牌上标示车辆识别代号（L1、L3类车辆可除外），产品标牌的型式、标示位置、标示要求应符合GB/T 18411的规定。\n" +
+ "5.3车辆应至少有一个车辆识别代号直接打刻在车架（无车架的车辆为车身主要承载且不能拆卸的部件）能防止锈烛、磨损的部位上。其中：\n" +
+ "a）\tM1类车辆的车辆识别代号应打刻在发动机舱内能防止替换的车辆结构件上，或打刻在车门 立柱上，如受结构限制没有打刻空间时也可打刻在右侧除行李舱外的车辆其他结构件上；\n" +
+ "b）\t最大设计总质量大于或等于12000 kg的货车及所有牵引杆挂车，车辆识别代号应打刻在右前轮纵向中心线前端纵梁外侧，如受结构限制也可打刻在右前轮纵向中心线附近纵梁外侧；\n" +
+ "c）\t半挂车和中置轴挂车的车辆识别代号应打刻在右前支腿前端纵梁外侧（无纵梁车辆除外）；\n" +
+ "d）\t其他汽车和无纵梁挂车的车辆识别代号应打刻在车辆右侧前部的车辆结构件上，如受结构限 制也可打刻在右侧其他车辆结构件上。\n" +
+ "打刻车辆识别代号的部件不应采用打磨、挖补、垫片、凿改、重新涂漆（设计和制造上为保护打刻的 车辆识别代号而采取涂漆工艺的情形除外）等方式处理，从上（前）方观察时，打刻区域周边足够大面积 的表面不应有任何覆盖物，如有覆盖物，该覆盖物的表面应明确标示“车辆识别代号”或“VIN”字样，且覆盖物在不使用任何专用工具的情况下能直接取下（或揭开）及复原，以方便地观察到足够大的包括打刻区域的表面。\n" +
+ "注1：打刻区域周边足够大面积的表面（足够大的包括打刻区域的表面）是指打刻车辆识别代号的部件的全部表面，但所暴露表面能满足查看打刻车辆识别代号的部件有无挖补、重新焊接、粘贴等痕迹的需要时，也应视为满足要求。\n" +
+ "注2：对摩托车，打刻的车辆识别代号在不举升车辆的情形下可观察、拓印的，视为满足要求。\n" +
+ "打刻的车辆识别代号从上（前）方应易于观察、拓印，对于汽车和挂车还应能拍照。\n" +
+ "5.4具有电子控制单元的汽车，其至少有一个电子控制单元应不可篡改地存储车辆识别代号。\n" +
+ "5.5 M1、N1类车辆应在靠近风窗立柱的位置标示车辆识别代号，该车辆识别代号在白天不需移动任何部件从车外即能清晰识读。\n" +
+ "5.6除按照5.2、5.3、5.4、5.5规定标示车辆识别代号之外，类车辆还应在行李舱的易见部位标示车辆识别代号；且若车辆制造厂选取车辆识别代号作为车辆及部件识别标记的标识信息，还应按照GB 30509的规定，标示车辆识别代号。\n" +
+ "5.7除按照5.2、5.3、5.4规定标示车辆识别代号之外，最大设计总质量大于或等于12000 kg的栏板式、仓栅式、自卸式、罐式货车及最大设计总质量大于或等于10000 kg的栏板式、仓栅式、自卸式、罐式挂车还应在其货箱或常压罐体（或设计和制造上固定在货箱或常压罐体上且用于与车架连接的结构件）上打刻至少两个车辆识别代号。打刻的车辆识别代号应位于货箱（常压罐体）左、右两侧或前端面且易于拍照；且若打刻在货箱（常压罐体）左、右两侧时，打刻的车辆识别代号距货箱（常压罐体）前端面的距离应小于或等于1 000 mm，若打刻在左、右两侧连接结构件时应尽量靠近货箱（常压罐体）前端面。\n" +
+ "5.8车辆制造厂应至少在一种随车文件中标示车辆识别代号。";
+
+ String str4 = "\n" +
+ "5.3车辆的驱动\n" +
+ "5.3.1车辆不应靠自身动力驱动。\n" +
+ "5.3.2在碰撞瞬间，车辆应不冉承受任何附加转向或驱动装置的作用。\n" +
+ "5.3.3车辆到达壁障的路线在横向任一方向偏离理论轨迹均不应超过150 mm。\n" +
+ "5.4 试验速度\n" +
+ "在碰撞瞬间，车辆速度应为504 km/h。如果试验在更高的碰撞速度下进行并且车辆符合要求，也认为试验合格。\n" +
+ "5.5对前排座椅假人的测量\n" +
+ "5.5.1为确定性能指标必需的所有测量，均应采用符合附录D要求的测量系统。\n" +
+ "5.5.2不同的参数应通过具备下列CFC（通道的频率等级）的独立数据通道来记录。\n" +
+ "5.5.2.1对假人头部的测量\n" +
+ "重心处的加速度（a）由加速度的二维分量计算得出。加速度分量测量时，CFC为1000。\n" +
+ "5.5.2.2对假人颈部的测量\n" +
+ "5.5.2.2.1在头颈连接处测量的轴向张力和前后剪切力，CFC为1000。\n" +
+ "5.5.2.2.2在头颈连接处测量的对Y轴的弯矩，CFC为600。\n" +
+ "5.5.2.3对假人胸部的测量\n" +
+ "胸部变形测量时，CFC为180。\n" +
+ "5.5.2.4对假人大腿的测量\n" +
+ "轴向压缩力测量时，CFC为600。";
+
+
+ double similarity = CompHanLPUtils.findSimilarity(str1, str2);
+ NumberFormat nf = NumberFormat.getPercentInstance();
+ nf.setMaximumIntegerDigits(2);//小数点前保留几位
+ nf.setMinimumFractionDigits(2);// 小数点后保留几位
+ String similarityDegree = nf.format(similarity);
+ System.out.println(similarityDegree);
+ System.out.println("======================================================");
+ double similarity1 = CompHanLPUtils.findSimilarity(str1, str3);
+ System.out.println(similarity1);
+
+ System.out.println("======================================================");
+ double similarity2 = CompHanLPUtils.findSimilarity(str1, str4);
+ System.out.println(similarity2);
+
+
+
+ System.out.println("======================================================");
+ double similarity3 = CompHanLPUtils.findSimilarity(str3, str4);
+ System.out.println(similarity3);
+
+ }
+
+}
+
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarItemsCompareHisEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarItemsCompareHisEOMapper.xml
new file mode 100644
index 00000000..72ef7e7a
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarItemsCompareHisEOMapper.xml
@@ -0,0 +1,269 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ id, old_items_id, old_items_name, old_items_text, new_items_id, new_items_name, new_items_text,
+ create_user, create_time, modify_user, modify_time, stand_his_id, similarity_degree,
+ old_items_num, new_items_num,old_remark,new_remark
+
+
+
+
+ where 1=1
+
+
+ and id ${idOperator} #{id}
+
+
+ and old_items_id ${oldItemsIdOperator} #{oldItemsId}
+
+
+ and old_items_name ${oldItemsNameOperator} #{oldItemsName}
+
+
+ and old_items_text ${oldItemsTextOperator} #{oldItemsText}
+
+
+ and new_items_id ${newItemsIdOperator} #{newItemsId}
+
+
+ and new_items_name ${newItemsNameOperator} #{newItemsName}
+
+
+ and new_items_text ${newItemsTextOperator} #{newItemsText}
+
+
+ and create_user ${createUserOperator} #{createUser}
+
+
+ and create_time ${createTimeOperator} #{createTime}
+
+
+ and create_time >= #{createTime1}
+
+
+ and create_time <= #{createTime2}
+
+
+ and modify_user ${modifyUserOperator} #{modifyUser}
+
+
+ and modify_time ${modifyTimeOperator} #{modifyTime}
+
+
+ and modify_time >= #{modifyTime1}
+
+
+ and modify_time <= #{modifyTime2}
+
+
+ and stand_his_id ${standHisIdOperator} #{standHisId}
+
+
+ and similarity_degree ${similarityDegreeOperator} #{similarityDegree}
+
+
+ and old_items_num ${oldItemsNumOperator} #{oldItemsNum}
+
+
+ and new_items_num ${newItemsNumOperator} #{newItemsNum}
+
+
+
+
+
+
+
+ insert into SAR_ITEMS_COMPARE_HIS()
+ values (#{id, jdbcType=VARCHAR}, #{oldItemsId, jdbcType=VARCHAR}, #{oldItemsName, jdbcType=VARCHAR}, #{oldItemsText, jdbcType=CLOB}, #{newItemsId, jdbcType=VARCHAR}, #{newItemsName, jdbcType=VARCHAR}, #{newItemsText, jdbcType=CLOB}, #{createUser, jdbcType=VARCHAR}, #{createTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}, #{modifyTime, jdbcType=TIMESTAMP}, #{standHisId, jdbcType=VARCHAR}, #{similarityDegree, jdbcType=VARCHAR}, #{oldItemsNum, jdbcType=VARCHAR}, #{newItemsNum, jdbcType=VARCHAR})
+
+
+
+
+
+ insert into SAR_ITEMS_COMPARE_HIS
+
+ id,
+ old_items_id,
+ old_items_name,
+ old_items_text,
+ new_items_id,
+ new_items_name,
+ new_items_text,
+ create_user,
+ create_time,
+ modify_user,
+ modify_time,
+ stand_his_id,
+ similarity_degree,
+ old_items_num,
+ new_items_num,
+ old_remark,
+ new_remark,
+
+
+ #{id, jdbcType=VARCHAR},
+ #{oldItemsId, jdbcType=VARCHAR},
+ #{oldItemsName, jdbcType=VARCHAR},
+ #{oldItemsText, jdbcType=CLOB},
+ #{newItemsId, jdbcType=VARCHAR},
+ #{newItemsName, jdbcType=VARCHAR},
+ #{newItemsText, jdbcType=CLOB},
+ #{createUser, jdbcType=VARCHAR},
+ #{createTime, jdbcType=TIMESTAMP},
+ #{modifyUser, jdbcType=VARCHAR},
+ #{modifyTime, jdbcType=TIMESTAMP},
+ #{standHisId, jdbcType=VARCHAR},
+ #{similarityDegree, jdbcType=VARCHAR},
+ #{oldItemsNum, jdbcType=VARCHAR},
+ #{newItemsNum, jdbcType=VARCHAR},
+ #{oldRemark, jdbcType=VARCHAR},
+ #{newRemark, jdbcType=VARCHAR},
+
+
+
+
+
+ update SAR_ITEMS_COMPARE_HIS
+ set old_items_id = #{oldItemsId},
+ old_items_name = #{oldItemsName},
+ old_items_text = #{oldItemsText},
+ new_items_id = #{newItemsId},
+ new_items_name = #{newItemsName},
+ new_items_text = #{newItemsText},
+ create_user = #{createUser},
+ create_time = #{createTime},
+ modify_user = #{modifyUser},
+ modify_time = #{modifyTime},
+ stand_his_id = #{standHisId},
+ similarity_degree = #{similarityDegree},
+ old_items_num = #{oldItemsNum},
+ new_items_num = #{newItemsNum}
+ where id = #{id}
+
+
+
+
+ update SAR_ITEMS_COMPARE_HIS
+
+
+ old_items_id = #{oldItemsId},
+
+
+ old_items_name = #{oldItemsName},
+
+
+ old_items_text = #{oldItemsText},
+
+
+ new_items_id = #{newItemsId},
+
+
+ new_items_name = #{newItemsName},
+
+
+ new_items_text = #{newItemsText},
+
+
+ create_user = #{createUser},
+
+
+ create_time = #{createTime},
+
+
+ modify_user = #{modifyUser},
+
+
+ modify_time = #{modifyTime},
+
+
+ stand_his_id = #{standHisId},
+
+
+ similarity_degree = #{similarityDegree},
+
+
+ old_items_num = #{oldItemsNum},
+
+
+ new_items_num = #{newItemsNum},
+
+
+ old_remark = #{oldRemark},
+
+
+ new_remark = #{newRemark},
+
+
+ where id = #{id}
+
+
+
+
+
+
+
+ delete from SAR_ITEMS_COMPARE_HIS
+ where id = #{value}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml
new file mode 100644
index 00000000..38a88987
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml
@@ -0,0 +1,273 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ compare_type, id, old_stand_id, old_stand_num, old_stand_name, new_stand_id, new_stand_num, new_stand_name, old_file_type, old_sar_type, create_user, create_time, modify_user, modify_time, new_file_type, new_sar_type
+
+
+
+
+ where 1=1
+
+
+ and compare_type ${compareTypeOperator} #{compareType}
+
+
+ and id ${idOperator} #{id}
+
+
+ and old_stand_id ${oldStandIdOperator} #{oldStandId}
+
+
+ and old_stand_num ${oldStandNumOperator} #{oldStandNum}
+
+
+ and old_stand_name ${oldStandNameOperator} #{oldStandName}
+
+
+ and new_stand_id ${newStandIdOperator} #{newStandId}
+
+
+ and new_stand_num ${newStandNumOperator} #{newStandNum}
+
+
+ and new_stand_name ${newStandNameOperator} #{newStandName}
+
+
+ and old_file_type ${oldFileTypeOperator} #{oldFileType}
+
+
+ and old_sar_type ${oldSarTypeOperator} #{oldSarType}
+
+
+ and create_user ${createUserOperator} #{createUser}
+
+
+ and create_time ${createTimeOperator} #{createTime}
+
+
+ and create_time >= #{createTime1}
+
+
+ and create_time <= #{createTime2}
+
+
+ and modify_user ${modifyUserOperator} #{modifyUser}
+
+
+ and modify_time ${modifyTimeOperator} #{modifyTime}
+
+
+ and modify_time >= #{modifyTime1}
+
+
+ and modify_time <= #{modifyTime2}
+
+
+ and new_file_type ${newFileTypeOperator} #{newFileType}
+
+
+ and new_sar_type ${newSarTypeOperator} #{newSarType}
+
+
+ and (old_stand_num like concat('%',#{oldNumOrName},'%') OR old_stand_name like concat('%',#{oldNumOrName},'%'))
+
+
+ and (new_stand_num like concat('%',#{newNumOrName},'%') OR new_stand_name like concat('%',#{newNumOrName},'%'))
+
+
+
+
+
+
+
+ insert into SAR_STAND_COMPARE_HIS()
+ values (#{compareType, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}, #{oldStandId, jdbcType=VARCHAR}, #{oldStandNum, jdbcType=VARCHAR}, #{oldStandName, jdbcType=VARCHAR}, #{newStandId, jdbcType=VARCHAR}, #{newStandNum, jdbcType=VARCHAR}, #{newStandName, jdbcType=VARCHAR}, #{oldFileType, jdbcType=VARCHAR}, #{oldSarType, jdbcType=VARCHAR}, #{createUser, jdbcType=VARCHAR}, #{createTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}, #{modifyTime, jdbcType=TIMESTAMP}, #{newFileType, jdbcType=VARCHAR}, #{newSarType, jdbcType=VARCHAR})
+
+
+
+
+
+ insert into SAR_STAND_COMPARE_HIS
+
+ compare_type,
+ id,
+ old_stand_id,
+ old_stand_num,
+ old_stand_name,
+ new_stand_id,
+ new_stand_num,
+ new_stand_name,
+ old_file_type,
+ old_sar_type,
+ create_user,
+ create_time,
+ modify_user,
+ modify_time,
+ new_file_type,
+ new_sar_type,
+
+
+ #{compareType, jdbcType=VARCHAR},
+ #{id, jdbcType=VARCHAR},
+ #{oldStandId, jdbcType=VARCHAR},
+ #{oldStandNum, jdbcType=VARCHAR},
+ #{oldStandName, jdbcType=VARCHAR},
+ #{newStandId, jdbcType=VARCHAR},
+ #{newStandNum, jdbcType=VARCHAR},
+ #{newStandName, jdbcType=VARCHAR},
+ #{oldFileType, jdbcType=VARCHAR},
+ #{oldSarType, jdbcType=VARCHAR},
+ #{createUser, jdbcType=VARCHAR},
+ #{createTime, jdbcType=TIMESTAMP},
+ #{modifyUser, jdbcType=VARCHAR},
+ #{modifyTime, jdbcType=TIMESTAMP},
+ #{newFileType, jdbcType=VARCHAR},
+ #{newSarType, jdbcType=VARCHAR},
+
+
+
+
+
+ update SAR_STAND_COMPARE_HIS
+ set compare_type = #{compareType},
+ old_stand_id = #{oldStandId},
+ old_stand_num = #{oldStandNum},
+ old_stand_name = #{oldStandName},
+ new_stand_id = #{newStandId},
+ new_stand_num = #{newStandNum},
+ new_stand_name = #{newStandName},
+ old_file_type = #{oldFileType},
+ old_sar_type = #{oldSarType},
+ create_user = #{createUser},
+ create_time = #{createTime},
+ modify_user = #{modifyUser},
+ modify_time = #{modifyTime},
+ new_file_type = #{newFileType},
+ new_sar_type = #{newSarType}
+ where id = #{id}
+
+
+
+
+ update SAR_STAND_COMPARE_HIS
+
+
+ compare_type = #{compareType},
+
+
+ old_stand_id = #{oldStandId},
+
+
+ old_stand_num = #{oldStandNum},
+
+
+ old_stand_name = #{oldStandName},
+
+
+ new_stand_id = #{newStandId},
+
+
+ new_stand_num = #{newStandNum},
+
+
+ new_stand_name = #{newStandName},
+
+
+ old_file_type = #{oldFileType},
+
+
+ old_sar_type = #{oldSarType},
+
+
+ create_user = #{createUser},
+
+
+ create_time = #{createTime},
+
+
+ modify_user = #{modifyUser},
+
+
+ modify_time = #{modifyTime},
+
+
+ new_file_type = #{newFileType},
+
+
+ new_sar_type = #{newSarType},
+
+
+ where id = #{id}
+
+
+
+
+
+
+
+ delete from SAR_STAND_COMPARE_HIS
+ where id = #{value}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandItemsCompareHisEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandItemsCompareHisEOMapper.xml
new file mode 100644
index 00000000..eeb71c51
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandItemsCompareHisEOMapper.xml
@@ -0,0 +1,222 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ id, items_id, items_name, items_num, items_text, items_display_num, target_stand, left_or_right,
+ stand_his_id, create_time, modify_time,remark
+
+
+
+
+ where 1=1
+
+
+ and id ${idOperator} #{id}
+
+
+ and items_id ${itemsIdOperator} #{itemsId}
+
+
+ and items_name ${itemsNameOperator} #{itemsName}
+
+
+ and items_num ${itemsNumOperator} #{itemsNum}
+
+
+ and items_text ${itemsTextOperator} #{itemsText}
+
+
+ and items_display_num ${itemsDisplayNumOperator} #{itemsDisplayNum}
+
+
+ and target_stand ${targetStandOperator} #{targetStand}
+
+
+ and left_or_right ${leftOrRightOperator} #{leftOrRight}
+
+
+ and stand_his_id ${standHisIdOperator} #{standHisId}
+
+
+ and create_time ${createTimeOperator} #{createTime}
+
+
+ and create_time >= #{createTime1}
+
+
+ and create_time <= #{createTime2}
+
+
+ and modify_time ${modifyTimeOperator} #{modifyTime}
+
+
+ and modify_time >= #{modifyTime1}
+
+
+ and modify_time <= #{modifyTime2}
+
+
+
+
+
+
+
+ insert into SAR_STAND_ITEMS_COMPARE_HIS()
+ values (#{id, jdbcType=VARCHAR}, #{itemsId, jdbcType=VARCHAR}, #{itemsName, jdbcType=VARCHAR}, #{itemsNum, jdbcType=VARCHAR}, #{itemsText, jdbcType=CLOB}, #{itemsDisplayNum, jdbcType=INTEGER}, #{targetStand, jdbcType=INTEGER}, #{leftOrRight, jdbcType=VARCHAR}, #{standHisId, jdbcType=VARCHAR}, #{createTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP})
+
+
+
+
+
+ insert into SAR_STAND_ITEMS_COMPARE_HIS
+
+ id,
+ items_id,
+ items_name,
+ items_num,
+ items_text,
+ items_display_num,
+ target_stand,
+ left_or_right,
+ stand_his_id,
+ create_time,
+ modify_time,
+ remark,
+
+
+ #{id, jdbcType=VARCHAR},
+ #{itemsId, jdbcType=VARCHAR},
+ #{itemsName, jdbcType=VARCHAR},
+ #{itemsNum, jdbcType=VARCHAR},
+ #{itemsText, jdbcType=CLOB},
+ #{itemsDisplayNum, jdbcType=INTEGER},
+ #{targetStand, jdbcType=INTEGER},
+ #{leftOrRight, jdbcType=VARCHAR},
+ #{standHisId, jdbcType=VARCHAR},
+ #{createTime, jdbcType=TIMESTAMP},
+ #{modifyTime, jdbcType=TIMESTAMP},
+ #{remark, jdbcType=VARCHAR},
+
+
+
+
+
+ update SAR_STAND_ITEMS_COMPARE_HIS
+ set items_id = #{itemsId},
+ items_name = #{itemsName},
+ items_num = #{itemsNum},
+ items_text = #{itemsText},
+ items_display_num = #{itemsDisplayNum},
+ target_stand = #{targetStand},
+ left_or_right = #{leftOrRight},
+ stand_his_id = #{standHisId},
+ create_time = #{createTime},
+ modify_time = #{modifyTime}
+ where id = #{id}
+
+
+
+
+ update SAR_STAND_ITEMS_COMPARE_HIS
+
+
+ items_id = #{itemsId},
+
+
+ items_name = #{itemsName},
+
+
+ items_num = #{itemsNum},
+
+
+ items_text = #{itemsText},
+
+
+ items_display_num = #{itemsDisplayNum},
+
+
+ target_stand = #{targetStand},
+
+
+ left_or_right = #{leftOrRight},
+
+
+ stand_his_id = #{standHisId},
+
+
+ create_time = #{createTime},
+
+
+ modify_time = #{modifyTime},
+
+
+ remark = #{remark},
+
+
+ where id = #{id}
+
+
+
+
+
+
+
+ delete from SAR_STAND_ITEMS_COMPARE_HIS
+ where id = #{value}
+
+
+
+
+
+
+
+
+
+
+
+