","");
+ 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/sarInstitution/service/impl/TsInstitutionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java
index 0d3fd21e..bcb6eef6 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java
@@ -156,14 +156,20 @@ public class TsInstitutionServiceImpl extends ServiceImpl jsons=syncUserService.syncFotonOrg();
- for(String json:jsons){
- JSONObject jsonObject= JSON.parseObject(json);
- JSONArray results=jsonObject.getJSONArray("results");
- List syncInstitutions=results.toJavaList(SyncInstitution.class);
- List tsInstitutions=SyncInstitution.syncToInstitution(syncInstitutions);
- batchInsert(tsInstitutions);
- }
+// List jsons=syncUserService.syncFotonOrg();
+// for(String json:jsons){
+// JSONObject jsonObject= JSON.parseObject(json);
+// JSONArray results=jsonObject.getJSONArray("results");
+// List syncInstitutions=results.toJavaList(SyncInstitution.class);
+// List tsInstitutions=SyncInstitution.syncToInstitution(syncInstitutions);
+// batchInsert(tsInstitutions);
+// }
+ String json="{\"status\":\"true\",\"message\":\"成功\",\"cookie\":null,\"returnCode\":\"0\",\"results\":[{\"orgStatus\":\"1\",\"departmentName\":\"信息技术部\",\"orgType\":\"E1\",\"orgName\":\"信息技术部\",\"parentOrgNumber\":\"31000000\",\"orgShortName\":\"信息技术部\",\"orgNumber\":\"30002337\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225061931Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"研发工程系统部\",\"orgType\":\"E1\",\"orgName\":\"研发工程系统部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"研发工程系统部\",\"orgNumber\":\"40009091\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/研发工程系统部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062001Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"生产与质量系统部\",\"orgType\":\"E1\",\"orgName\":\"生产与质量系统部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"生产与质量系统部\",\"orgNumber\":\"40009092\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/生产与质量系统部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062001Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"营销与售后系统部\",\"orgType\":\"E1\",\"orgName\":\"营销与售后系统部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"营销与售后系统部\",\"orgNumber\":\"40009093\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/营销与售后系统部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062001Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"财务系统部\",\"orgType\":\"E1\",\"orgName\":\"财务系统部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"财务系统部\",\"orgNumber\":\"40009094\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/财务系统部\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075121Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"协作系统部\",\"orgType\":\"E1\",\"orgName\":\"协作系统部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"协作系统部\",\"orgNumber\":\"40009095\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/协作系统部\",\"order\":\"null\",\"modifyTimestamp\":\"20200219011044Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"大数据部\",\"orgType\":\"E1\",\"orgName\":\"大数据部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"大数据部\",\"orgNumber\":\"40009096\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/大数据部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062001Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"福田智科\",\"orgType\":\"E1\",\"orgName\":\"福田智科\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"福田智科\",\"orgNumber\":\"40009385\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/福田智科\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075123Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"系统集成与测试部\",\"orgType\":\"E1\",\"orgName\":\"系统集成与测试部\",\"parentOrgNumber\":\"40009385\",\"orgShortName\":\"系统集成与测试部\",\"orgNumber\":\"40009386\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/福田智科/系统集成与测试部\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075122Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"应用开发部\",\"orgType\":\"E1\",\"orgName\":\"应用开发部\",\"parentOrgNumber\":\"40009385\",\"orgShortName\":\"应用开发部\",\"orgNumber\":\"40009387\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/福田智科/应用开发部\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075122Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"营销部\",\"orgType\":\"E1\",\"orgName\":\"营销部\",\"parentOrgNumber\":\"40009385\",\"orgShortName\":\"营销部\",\"orgNumber\":\"40009388\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/福田智科/营销部\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075122Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"服务部\",\"orgType\":\"E1\",\"orgName\":\"服务部\",\"parentOrgNumber\":\"40009385\",\"orgShortName\":\"服务部\",\"orgNumber\":\"40009389\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/福田智科/服务部\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075122Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"综合管理部\",\"orgType\":\"E1\",\"orgName\":\"综合管理部\",\"parentOrgNumber\":\"40009385\",\"orgShortName\":\"综合管理部\",\"orgNumber\":\"40009390\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/福田智科/综合管理部\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075122Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"车联网平台开发部\",\"orgType\":\"E1\",\"orgName\":\"车联网平台开发部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"车联网平台开发部\",\"orgNumber\":\"40009391\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/车联网平台开发部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062001Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"规划与管理部\",\"orgType\":\"E1\",\"orgName\":\"规划与管理部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"规划与管理部\",\"orgNumber\":\"40009425\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/规划与管理部\",\"order\":\"null\",\"modifyTimestamp\":\"20200211123206Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"车联网平台开发部\",\"orgType\":\"E1\",\"orgName\":\"车联网平台开发部\",\"parentOrgNumber\":\"40009385\",\"orgShortName\":\"车联网平台开发部\",\"orgNumber\":\"40012865\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/福田智科/车联网平台开发部\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075121Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"服务支持系统部\",\"orgType\":\"E1\",\"orgName\":\"服务支持系统部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"服务支持系统部\",\"orgNumber\":\"40012871\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/服务支持系统部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062018Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"信息安全部\",\"orgType\":\"E1\",\"orgName\":\"信息安全部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"信息安全部\",\"orgNumber\":\"40012872\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/信息安全部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062018Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"IT基础设施部\",\"orgType\":\"E1\",\"orgName\":\"IT基础设施部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"IT基础设施部\",\"orgNumber\":\"40012873\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/IT基础设施部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062018Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"IT开发中心\",\"orgType\":\"E1\",\"orgName\":\"IT开发中心\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"IT开发中心\",\"orgNumber\":\"40012874\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/IT开发中心\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062018Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"IT共享服务中心\",\"orgType\":\"E1\",\"orgName\":\"IT共享服务中心\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"IT共享服务中心\",\"orgNumber\":\"40013000\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/IT共享服务中心\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062019Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"工业4.0推进办公室\",\"orgType\":\"E1\",\"orgName\":\"工业4.0推进办公室\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"工业4.0推进办公室\",\"orgNumber\":\"40013294\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/工业4.0推进办公室\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062021Z\"}]}";
+ JSONObject jsonObject= JSON.parseObject(json);
+ JSONArray results=jsonObject.getJSONArray("results");
+ List syncInstitutions=results.toJavaList(SyncInstitution.class);
+ List tsInstitutions=SyncInstitution.syncToInstitution(syncInstitutions);
+ batchInsert(tsInstitutions);
}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/entity/SarMenu.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/entity/SarMenu.java
index 97433f7b..c69f65bc 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/entity/SarMenu.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/entity/SarMenu.java
@@ -90,6 +90,9 @@ public class SarMenu extends BaseEntity {
@TableField(exist = false)
private List children;
+ @ApiModelProperty(value = "层级")
+ private Integer level;
+
@TableField(exist=false)
private List roleIds;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/impl/SarMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/impl/SarMenuServiceImpl.java
index 609f7e67..1bf86aa1 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/impl/SarMenuServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/impl/SarMenuServiceImpl.java
@@ -247,6 +247,8 @@ public class SarMenuServiceImpl extends ServiceImpl impleme
if(menuIds!=null&&menuIds.size()>0){
QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>();
sarMenuQueryWrapper.in("id",menuIds);
+ sarMenuQueryWrapper.eq("level",2);
+ sarMenuQueryWrapper.isNotNull("href");
return dao.selectList(sarMenuQueryWrapper);
}
return new ArrayList<>();
@@ -263,6 +265,8 @@ public class SarMenuServiceImpl extends ServiceImpl impleme
sarMenuQueryWrapper.eq("PARENT_ID",parent.getId());
List children=dao.selectList(sarMenuQueryWrapper);
for(SarMenu sarMenu:children){
+ sarMenu.setLevel(parent.getLevel()+1);
+ dao.updateById(sarMenu);
sarMenu.setChildren(recursionGetChildren((sarMenu)));
}
return children;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardController.java
new file mode 100644
index 00000000..34ebbbb5
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardController.java
@@ -0,0 +1,76 @@
+package com.adc.da.slrs.sarMenuStandard.controller;
+
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarMenu.entity.SarMenu;
+import com.adc.da.slrs.sarMenu.service.ISarMenuService;
+import com.adc.da.slrs.sarMenuStandard.service.ISarMenuStandardService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandard;
+import io.swagger.annotations.Api;
+import com.adc.da.base.web.BaseController;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+*
+ * 前端控制器
+ *
+*
+* @author super_liu
+* @since 2021-07-07
+*/
+@RestController
+@Api(tags = "福田标准法规--标准法规库-菜单标准体系")
+@RequestMapping("/${restPath}/lawss/sarMenuStandard")
+public class SarMenuStandardController extends BaseController {
+
+ @Autowired
+ private ISarMenuStandardService iSarMenuStandardService;
+
+ @ApiOperation("查询所有菜单")
+ @GetMapping
+ public ResponseMessage> getAll(@RequestParam String dicId){
+ List sarMenus=iSarMenuStandardService.getAll(dicId);
+ return Result.success(sarMenus);
+ }
+
+ @ApiOperation("根据ID查询菜单")
+ @GetMapping("/getSarMenuStandardById")
+ public ResponseMessage getSarMenuStandardById(@RequestParam String menuId){
+ SarMenuStandard sarMenus = iSarMenuStandardService.getById(menuId);
+ if(sarMenus != null && sarMenus.getParentIds() != null && StringUtils.isNotBlank(sarMenus.getParentIds())){
+ List menuStandards = iSarMenuStandardService.getMenuByIds(Arrays.asList(sarMenus.getParentIds().split(",")));
+ if(!menuStandards.isEmpty()){
+ String parentIdsName = menuStandards.stream().map(SarMenuStandard::getMenuName).collect(Collectors.joining(","));
+ sarMenus.setParentIdsName(parentIdsName);
+ }
+ }
+ return Result.success(sarMenus);
+ }
+
+ @ApiOperation("添加菜单")
+ @PostMapping("/add")
+ public ResponseMessage");
+ }
+ 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/sarMenuStandard/SarMenuStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarMenuStandard/SarMenuStandardMapper.xml
new file mode 100644
index 00000000..4f4bb0b0
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarMenuStandard/SarMenuStandardMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarRole/TsRoleMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarRole/TsRoleMapper.xml
index e4ac1c0e..eba64569 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarRole/TsRoleMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarRole/TsRoleMapper.xml
@@ -1,6 +1,7 @@
+
+
+
+
+
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUrl/TsUrlDao.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUrl/TsUrlDao.xml
new file mode 100644
index 00000000..a6d3c677
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUrl/TsUrlDao.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
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}
+
+
+
+
+
+
+
+
+
+
+
+