Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemController.java

@@ -167,4 +167,16 @@ public class SarFileCompareItemController extends JeroController<SarFileCompareI
         return super.importExcel(request, response, SarFileCompareItem.class);
     }
 
+	 /**
+	  * 条款对比高亮
+	  */
+	 @AutoLog(value = "文档对比信息条款表-条款对比高亮")
+	 @ApiOperation(value="文档对比信息条款表-条款对比高亮", notes="文档对比信息条款表-条款对比高亮")
+	 @GetMapping(value = "/clauseComparison")
+	 public Result<?> clauseComparison(@RequestParam(name="leftId",required=true) String leftId,
+									   @RequestParam(name="rightId",required=true) String rightId) {
+		 List<String> res = sarFileCompareItemService.clauseComparison(leftId,rightId);
+		 return Result.OK(res);
+	 }
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemService.java

@@ -72,4 +72,6 @@ public interface ISarFileCompareItemService extends IService<SarFileCompareItem>
     List<SarFileCompareItem> queryListByInfoId(String infoId);
 
     Map<String, SarFileCompareItem> queryMapByInfoId(String infoId);
+
+    List<String> clauseComparison(String lid,String rid);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemServiceImpl.java

@@ -6,6 +6,7 @@ import com.jero.modules.compare.entity.SarFileCompareItem;
 import com.jero.modules.compare.mapper.SarFileCompareItemMapper;
 import com.jero.modules.compare.service.ISarFileCompareItemService;
 import com.jero.modules.compare.utils.CompareConst;
+import com.jero.modules.compare.utils.DiffUtils;
 import com.jero.modules.system.util.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -122,4 +123,13 @@ public class SarFileCompareItemServiceImpl extends ServiceImpl<SarFileCompareIte
         }
         return resMap;
     }
+
+    @Override
+    public List<String> clauseComparison(String lid, String rid) {
+        SarFileCompareItem leftItem = this.queryById(lid);
+        SarFileCompareItem rightItem = this.queryById(rid);
+        DiffUtils dmp = new DiffUtils();
+        List<String> htmlDiffStr = dmp.getHtmlDiffStr(leftItem.getItemsText(), rightItem.getItemsText());
+        return htmlDiffStr;
+    }
 }