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

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/feign/ArchiveAutoClient.java

@@ -1,5 +1,6 @@
 package org.springblade.archive.feign;
 
+import org.springblade.archive.entity.ArchiveProjectConfig;
 import org.springblade.archive.entity.ArchivesAuto;
 import org.springblade.archive.vo.ArchivesAutoVO;
 import org.springblade.common.constant.ArchiveConstant;
@@ -26,4 +27,8 @@ public interface ArchiveAutoClient {
 
     @PostMapping(API_PREFIX + "/saveArchiveAutoById")
     ArchivesAuto saveArchiveAutoById(@RequestParam Long id);
+
+
+    @PostMapping(API_PREFIX + "/getByProjectIdOrNew")
+    ArchiveProjectConfig getByProjectIdOrNew(@RequestParam Long projectId);
 }

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/DefaultConfig.java

@@ -77,4 +77,10 @@ public class DefaultConfig extends BaseEntity {
 	 * 所属 模式
 	 */
 	private int indexModel;
+
+	/**
+	 * app 是否跳过引导页
+	 */
+	private int appCheck;
+
 }

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/MoistureContentDTO.java

@@ -16,6 +16,9 @@ public class MoistureContentDTO {
     @ApiModelProperty(value = "当前位置")
     private String key ;
 
+    @ApiModelProperty(value = "表单pKeyId")
+    private Long keyId ;
+
     @ApiModelProperty(value = "合同段id")
     private String contractId ;
 

blade-service/blade-archive/src/main/java/org/springblade/archive/feign/ArchiveAutoClientImpl.java

@@ -1,11 +1,14 @@
 package org.springblade.archive.feign;
 
 import lombok.AllArgsConstructor;
+import org.springblade.archive.entity.ArchiveProjectConfig;
 import org.springblade.archive.entity.ArchivesAuto;
+import org.springblade.archive.service.IArchiveProjectConfigService;
 import org.springblade.archive.service.IArchivesAutoService;
 import org.springblade.archive.vo.ArchivesAutoVO;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
@@ -17,6 +20,8 @@ public class ArchiveAutoClientImpl implements ArchiveAutoClient {
 
     private IArchivesAutoService archivesAutoService;
 
+    private final IArchiveProjectConfigService archiveProjectConfigService;
+
     @Override
     public R saveArchiveAutoByNodes(@RequestBody List<ArchivesAuto> list) {
 
@@ -28,4 +33,9 @@ public class ArchiveAutoClientImpl implements ArchiveAutoClient {
     public ArchivesAuto saveArchiveAutoById(Long id) {
         return archivesAutoService.getById(id);
     }
+
+    @Override
+    public ArchiveProjectConfig getByProjectIdOrNew(@RequestParam Long projectId){
+        return archiveProjectConfigService.getByProjectIdOrNew(projectId);
+    }
 }

blade-service/blade-business/src/main/java/org/springblade/business/controller/DefaultConfigController.java

@@ -62,10 +62,11 @@ public class DefaultConfigController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入defaultConfig")
 	public R<DefaultConfig> detail(DefaultConfig defaultConfig, BladeUser user) {
-		defaultConfig.setCreateUser(user.getUserId());
-		defaultConfig.setClientId(user.getClientId());
-		DefaultConfig detail = defaultConfigService.getOne(Condition.getQueryWrapper(defaultConfig));
-		return R.data(detail);
+		DefaultConfig oldConfig = this.defaultConfigService.getOne(Wrappers.<DefaultConfig>lambdaQuery()
+				.eq(DefaultConfig::getCreateUser, user.getUserId())
+				.eq(DefaultConfig::getClientId, user.getClientId()));
+
+		return R.data(oldConfig);
 	}
 
 	/**
@@ -144,6 +145,7 @@ public class DefaultConfigController extends BladeController {
         DefaultConfig oldConfig = this.defaultConfigService.getOne(Wrappers.<DefaultConfig>lambdaQuery()
 				.eq(DefaultConfig::getCreateUser, bladeUser.getUserId())
 				.eq(DefaultConfig::getClientId, bladeUser.getClientId()));
+
         if (oldConfig != null) {
             //修改
             if (StringUtils.isNotEmpty(newConfig.getColor())) {
@@ -161,6 +163,9 @@ public class DefaultConfigController extends BladeController {
             if (StringUtils.isNotEmpty(newConfig.getFullScreen())) {
                 oldConfig.setFullScreen(newConfig.getFullScreen());
             }
+			if (StringUtils.isNotEmpty(newConfig.getAppCheck()+"")) {
+				oldConfig.setAppCheck(newConfig.getAppCheck());
+			}
             oldConfig.setOpinionView(newConfig.getOpinionView());
             return R.data(this.defaultConfigService.updateById(oldConfig));
         }
@@ -169,7 +174,6 @@ public class DefaultConfigController extends BladeController {
         newConfig.setCreateUser(AuthUtil.getUserId());
         newConfig.setCreateTime(new Date());
         newConfig.setClientId(bladeUser.getClientId());
-
         return R.status(defaultConfigService.save(newConfig));
     }
 }

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -2869,14 +2869,15 @@ public class InformationWriteQueryController extends BladeController {
         //保存进回收站
         this.recycleBinClient.saveDelBusinessData(idArray, StringUtils.isNotEmpty(removeNode.getFullName()) ? removeNode.getFullName() : removeNode.getNodeName(), 2, parentNodeName.toString(), removeNode.getProjectId(), removeNode.getContractId());
 
-        //改为物理删除
+        //改为物理删除 (8.28改为逻辑删除，方便恢复)
         Boolean aBoolean = this.wbsTreeContractClient.removeContractTreeNode(idArray);
 
         //更新redis
         //this.informationQueryService.AsyncWbsTree(removeNode.getParentId() + "", removeNode.getParentId() + "", removeNode.getContractId(), "", "1");
         this.informationQueryService.delAsyncWbsTree(removeNode.getContractId());
 
-        return R.data(aBoolean);
+//        return R.data(aBoolean);
+        return R.data(true);
     }
 
     /**

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -180,7 +180,8 @@ public class TaskController extends BladeController {
         R<SmsResponse> result = this.newSmsClient.sendMessage("test_code", JsonUtil.toJson(params), phone);
         if (result.getData().isSuccess()) {
             //记录当前验证码
-            DefaultConfig config = this.defaultConfigService.getOne(Wrappers.<DefaultConfig>lambdaQuery().eq(DefaultConfig::getCreateUser, AuthUtil.getUserId()));
+            DefaultConfig config = this.defaultConfigService.getOne(Wrappers.<DefaultConfig>lambdaQuery().eq(DefaultConfig::getCreateUser, AuthUtil.getUserId())
+                    .isNotNull(DefaultConfig::getSmsCode));
             if (config != null) {
                 //修改
                 config.setSmsCode(code);

blade-service/blade-business/src/main/java/org/springblade/business/mapper/DefaultConfigMapper.xml

@@ -22,6 +22,7 @@
         <result column="full_screen" property="fullScreen"/>
         <result column="client_id" property="clientId"/>
         <result column="index_model" property="indexModel"/>
+        <result column="app_check" property="appCheck"/>
     </resultMap>
 
 

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -999,7 +999,19 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                     String querySql = "select "+tabBusstimeInfo.getColKey()+" from "+tabBusstimeInfo.getTabEnName()+" where p_key_id="+idMap.get(tabBusstimeInfo.getTabEnName());
                     Map<String, Object> maps = jdbcTemplate.queryForMap(querySql);
                     if(maps!=null){
-                        dateInfo = maps.get(tabBusstimeInfo.getColKey())+"";
+                      String  keyData = maps.get(tabBusstimeInfo.getColKey())+"";
+                        if(StringUtils.isNotEmpty(keyData)){
+                            dateInfo = keyData.split("_\\^_")[0];
+                            if(dateInfo.indexOf("年")>=0){
+                                dateInfo = dateInfo.replace("年","-");
+                            }
+                            if(dateInfo.indexOf("月")>=0){
+                                dateInfo = dateInfo.replace("月","-");
+                            }
+                            if(dateInfo.indexOf("日")>=0){
+                                dateInfo = dateInfo.replace("日","");
+                            }
+                        }
                     }
                 }
                 System.out.println("----- 电签成功--------==修改---="+dateInfo);

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -293,112 +293,17 @@ public class ExcelTabController extends BladeController {
 
         String filecode = SnowFlakeUtil.getId() + "";
         String thmlUrl = file_path + filecode + ".html";
-        String thmlUrl2 = file_path + filecode + "123.html";
         String exceUrl = file_path + filecode + "123.xlsx";
-
-        // 解析原始excel
-        Workbook wb = new Workbook();
-        wb.loadFromMHtml(file.getInputStream());
-
-        // 操作
-        Workbook wb2 = new Workbook();
-        wb2.loadFromMHtml(file.getInputStream());
-        Worksheet sheet2 = wb2.getWorksheets().get(0);
-
-        HTMLOptions options = new HTMLOptions();
-        options.setImageEmbedded(true);
-        //获取工作表
-        Worksheet sheet = wb.getWorksheets().get(0);
-        sheet.saveToHtml(thmlUrl, options);
-
-        CellRange[] mergedCells = sheet.getMergedCells();
-        CellRange[] mergedCells3 = sheet2.getMergedCells();
-        Map<String, Map<String, Integer>> xyList = new HashMap<>();
-        int j = 0;
-        for (int i = 0; i < mergedCells.length; i++) {
-            Map<String, Integer> dataMap = new HashMap<>();
-            CellRange mergedCell = mergedCells[i];
-            j = j + 1;
-            mergedCells3[i].getComment().getRichText().setText(j + "");
-            mergedCell.setValue(j + "");
-            dataMap.put("x1", mergedCell.getRow());
-            dataMap.put("x2", mergedCell.getLastRow());
-            dataMap.put("y1", mergedCell.getColumn());
-            dataMap.put("y2", mergedCell.getLastColumn());
-            xyList.put(j + "", dataMap);
-        }
-
-        CellRange[] mergedCells2 = sheet.getCells();
-        CellRange[] mergedCells4 = sheet2.getCells();
-        for (int i = 0; i < mergedCells2.length; i++) {
-            CellRange mergedCell = mergedCells2[i];
-            String data = mergedCell.getComment().getRichText().getText();
-            if (StringUtils.isEmpty(data)) {
-                j = j + 1;
-                mergedCells4[i].getComment().getRichText().setText(j + "");
-                mergedCell.setValue(j + "");
-                Map<String, Integer> dataMap = new HashMap<>();
-                dataMap.put("x1", mergedCell.getRow());
-                dataMap.put("x2", mergedCell.getLastRow());
-                dataMap.put("y1", mergedCell.getColumn());
-                dataMap.put("y2", mergedCell.getLastColumn());
-                xyList.put(j + "", dataMap);
-            }
-        }
-        sheet.saveToHtml(thmlUrl2, options);
-
-        // 组装坐标
-        File html1 = new File(thmlUrl);  // 原始html
-        File html2 = new File(thmlUrl2); // 坐标html
-        InputStream inputStream1 = new FileInputStream(html1);
-        InputStream inputStream2 = new FileInputStream(html2);
-        String htmlString1 = IoUtil.readToString(inputStream1);
-        String htmlString2 = IoUtil.readToString(inputStream2);
-
-        Document doc1 = Jsoup.parse(htmlString1);
-        Element table1 = doc1.select("table").first();
-        Elements trs1 = table1.select("tr");
-        Document doc2 = Jsoup.parse(htmlString2);
-        Element table2 = doc2.select("table").first();
-        Elements trs2 = table2.select("tr");
-
-        for (int i = 0; i < trs1.size(); i++) {
-            Elements td1 = trs1.get(i).select("td");
-            Elements td2 = trs2.get(i).select("td");
-            for (int x = 0; x < td1.size(); x++) {
-                Element cell1 = td1.get(x);
-                Element cell2 = td2.get(x);
-                String html = cell2.html();
-                if (html.indexOf("div") >= 0) {
-                    html = cell2.children().get(0).html();
-                }
-                Map<String, Integer> xyMap = xyList.get(html);
-                if (xyMap != null) {
-                    cell1.attr("x1", xyMap.get("x1") + "");
-                    cell1.attr("x2", xyMap.get("x2") + "");
-                    cell1.attr("y1", xyMap.get("y1") + "");
-                    cell1.attr("y2", xyMap.get("y2") + "");
-                }
-            }
-        }
-
+        FileUtils.excelInfo(file.getInputStream(),exceUrl,thmlUrl,"1");
         // 上传excel文件
-        wb2.saveToFile(exceUrl,FileFormat.Version2013);
-
         BladeFile bladeFile = newIOSSClient.uploadFile(file.getOriginalFilename(),exceUrl);
-
-        File writeFile = new File(thmlUrl);
-        FileUtil.writeToFile(writeFile, doc1.html(), Boolean.parseBoolean("UTF-8"));
-
+      //  R<BladeFile> bladeFile = iossClient.addFileInfo(file);
+      //  BladeFile bladeFile1 = bladeFile.getData();
         detail.setExtension(file.getOriginalFilename());
         detail.setFileUrl(bladeFile.getLink());
         detail.setFileType(3); // 表示为清表信息  1 表示祖节点  2 表示为节点信息 3 表示清表
         detail.setHtmlUrl(thmlUrl);
         excelTabService.saveOrUpdate(detail);
-
-        if (html2.exists()) {
-            html2.delete();
-        }
         // 解析html
         expailHtmlInfo(thmlUrl, detail.getId());
         return R.success("上传成功");
@@ -652,10 +557,12 @@ public class ExcelTabController extends BladeController {
                             element.children().get(0).attr("@mouseup.left", "inputLeftClick(" + mousedown + ")");
                         }
                     } else {
-                        element.children().get(0).attr("placeholder", lastName)
+                        element.children().get(0)
+//                                .attr("placeholder", lastName)
                                 .attr("weighing", maxScore + "").attr("id", attrInfo).attr("keyName", attrInfo)
                                 .attr("@blur", "getRegularExpression(" + regularExpression + ",'" + filedLength + "')")
-                                .attr("maxlength", filedLength);
+                                .attr("maxlength", filedLength)
+                                .attr("class", "warnstyle");
                     }
                     element.attr("@click", "getInformation(" + oncklickText + ")");
                 }
@@ -836,6 +743,7 @@ public class ExcelTabController extends BladeController {
         }
 
         String fileUrl = wbsTreePrivate.getHtmlUrl();
+//        String fileUrl = "C:\\Users\\泓创研发01\\Desktop\\privateUrl\\1696003315218776064.html";
         File file1 = ResourceUtil.getFile(fileUrl);
         InputStream fileInputStream;
         if (file1.exists()) {
@@ -2177,10 +2085,8 @@ public class ExcelTabController extends BladeController {
         } catch (Exception e) {
             e.printStackTrace();
         }
-
         //更新缓存
         informationQueryClient.delAsyncWbsTree(contractId);
-
         return R.data("操作成功");
     }
 
@@ -3512,7 +3418,6 @@ public class ExcelTabController extends BladeController {
         InputStream fileInputStream = null;
         if (file1.exists()) {
             fileInputStream = new FileInputStream(file1);
-            ;
         } else {
             String path = sys_file_net_url + fileUrl.replaceAll("//", "/").replaceAll(file_path, "");
             fileInputStream = CommonUtil.getOSSInputStream(path);

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/LinkdataInfoController.java

@@ -68,6 +68,7 @@ public class LinkdataInfoController extends BladeController {
     private final WbsTreePrivateMapper wbsTreePrivateMapper;
 
     private final JdbcTemplate jdbcTemplate;
+
     /**
      * 详情
      */
@@ -169,7 +170,7 @@ public class LinkdataInfoController extends BladeController {
 
 
     /**
-     * 编辑表单-替换元素｜｜删除文本信息 保存
+     * 编辑表单-替换元素｜｜删除文本信息 单个保存
      */
     @PostMapping("/saveTabColInfo")
     @ApiOperationSupport(order = 9)
@@ -247,4 +248,98 @@ public class LinkdataInfoController extends BladeController {
     }
 
 
+
+
+    /**
+     * 编辑表单-替换元素｜｜删除文本信息 批量编辑保存
+     */
+    @PostMapping("/saveTabColInfo2")
+    @ApiOperationSupport(order = 9)
+    @ApiOperation(value = "编辑表单-替换元素｜｜删除文本信息 保存", notes = "传入linkdataInfo数组")
+    public R saveTabColInfo2(@Valid @RequestBody List<LinkdataInfo> list) throws IOException {
+        if (list != null && list.size() > 0) {
+            // 获取 节点信息
+            WbsTreePrivate wbsTreePrivate = wbsTreePrivateMapper.getByPKeyId(list.get(0).getTabId());
+            // 获取元素基本信息
+            WbsFormElement wbsFormElement = wbsFormElementService.getById(list.get(0).getHtmlType());
+            // 读取html页面信息
+            File file1 = ResourceUtil.getFile(wbsTreePrivate.getHtmlUrl());
+//                File file1 = ResourceUtil.getFile("C:\\Users\\泓创研发01\\Desktop\\privateUrl\\1696003315218776064.html");
+            FileInputStream inputStream = new FileInputStream(file1);
+            String htmlString = IoUtil.readToString(inputStream);
+            // 样式集合
+            Document doc = Jsoup.parse(htmlString);
+            //解析
+            Element table = doc.select("table").first();
+            Elements trs = table.select("tr");
+            for (LinkdataInfo linkdataInfo : list) {
+                Element element = trs.get(linkdataInfo.getTrIndex()).select("td").get(linkdataInfo.getTdIndex());
+                String keyId = "";
+                if (linkdataInfo.getColName().equals("/")) {
+                    element.empty();
+                } else {
+                    String enName = wbsFormElement.getEName();
+                    element.removeAttr("title");
+                    element.attr("title", enName);
+                    String dataInfo2 = wbsFormElement.getEKey() + "__" + linkdataInfo.getTrIndex() + "_" + linkdataInfo.getTdIndex();
+                    Element element1 = element.children().get(0);
+
+                    if (element.html().indexOf("el-tooltip") >= 0) {
+                        element1.removeAttr("placeholder");
+                        element1.removeAttr("keyName");
+                        element1.removeAttr("id");
+                        element1.removeAttr("weighing");
+                        element1.removeAttr("v-model");
+                        element1.removeAttr("@focus");
+                        keyId = element1.attr("keyName");
+                        element1 = element.children().get(0).children().get(0);
+                    }
+                    //如果是警告，则删除样式
+                    String aClass = element1.attr("class");
+                    if (StringUtils.isNotBlank(aClass)){
+                        if ("warnstyle".equals(aClass)){
+                            element1.removeAttr("class");
+                        }
+                    }
+
+                    element1.removeAttr("placeholder");
+                    element1.removeAttr("keyName");
+                    element1.removeAttr("id");
+                    element1.removeAttr("weighing");
+                    element1.removeAttr("v-model");
+                    element1.removeAttr("@focus");
+                    keyId = element1.attr("keyName");
+                    if (element.html().indexOf("hc-form-checkbox-group") >= 0) {
+                        element1.removeAttr(":val");
+                        element1.attr(":val", "formData." + dataInfo2);
+                    }
+
+                    element1.attr("placeholder", enName).attr("keyName", dataInfo2).attr("id", dataInfo2);
+                    element1.attr("weighing", "100");
+                    element1.attr("v-model", "formData." + dataInfo2);
+                    element.attr("@click", "getInformation('" + enName + "'," + linkdataInfo.getTrIndex() + "," + linkdataInfo.getTdIndex() + ")");
+                }
+
+                // 清空数据
+                if (StringUtils.isNotEmpty(keyId)) {
+                    String tabName = wbsTreePrivate.getInitTableName();
+                    String isExitSql = " select * from information_schema.TABLES where TABLE_NAME='" + tabName + "'";
+                    List<Map<String, Object>> tablist = jdbcTemplate.queryForList(isExitSql);
+                    if (tablist != null && tablist.size() > 0 && wbsTreePrivate.getType() != 10) {
+                        String clarSql = "update  " + tabName + " set " + keyId.split("__")[0] + "=null where p_key_id in(SELECT p_key_id FROM m_wbs_tree_contract WHERE id ='" + wbsTreePrivate.getId() + "' and project_id='" + wbsTreePrivate.getProjectId() + "' )";
+                        jdbcTemplate.execute(clarSql);
+                    }
+                }
+
+            }
+            File writefile = new File(wbsTreePrivate.getHtmlUrl());
+//                File writefile = new File("C:\\Users\\泓创研发01\\Desktop\\privateUrl\\1696003315218776064.html");
+            FileUtil.writeToFile(writefile, doc.html(), Boolean.parseBoolean("UTF-8"));
+            inputStream.close();
+            return R.success("操作成功");
+        }
+        return R.success("操作成功");
+    }
+
+
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/MixProportionInfoController.java

@@ -17,6 +17,8 @@ import org.springblade.manager.service.IMixProportionInfoService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import javax.validation.Valid;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -36,7 +38,8 @@ public class MixProportionInfoController extends BladeController {
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "计算含水率", notes = "计算含水率")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "key", value = "当前输入框位置", required = true),
+            @ApiImplicitParam(name = "key", value = "当前输入框位置", required = false),
+            @ApiImplicitParam(name = "pKeyId", value = "表单pKeyId", required = true),
             @ApiImplicitParam(name = "contractId", value = "合同段id", required = true),
             @ApiImplicitParam(name = "designStrength", value = "设计强度", required = true),
             @ApiImplicitParam(name = "sand", value = "黄砂含水率", required = false),
@@ -44,7 +47,7 @@ public class MixProportionInfoController extends BladeController {
             @ApiImplicitParam(name = "macadamTwo", value = "碎石2含水率", required = false),
             @ApiImplicitParam(name = "macadamThree", value = "碎石3含水率", required = false),
     })
-    public R calculateWater(@Valid @RequestBody MoistureContentDTO dto) {
+    public R calculateWater(@Valid @RequestBody MoistureContentDTO dto) throws IOException {
         return mixProportionInfoService.calculateWater(dto);
     }
 

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/WbsTreeContractClientImpl.java

@@ -159,11 +159,11 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
     @Override
     public Boolean removeContractTreeNode(List<String> ids) {
         if (ids.size() > 0) {
-            jdbcTemplate.execute("delete from m_wbs_tree_contract where p_key_id in(" + org.apache.commons.lang.StringUtils.join(ids, ",") + ")");
-            return true;
+//            jdbcTemplate.execute("delete from m_wbs_tree_contract where p_key_id in(" + org.apache.commons.lang.StringUtils.join(ids, ",") + ")");
+//            return true;
+            return this.wbsTreeContractService.update(Wrappers.<WbsTreeContract>lambdaUpdate().set(WbsTreeContract::getIsDeleted, 1).in(WbsTreeContract::getPKeyId, ids));
         }
         return false;
-        //return this.wbsTreeContractService.update(Wrappers.<WbsTreeContract>lambdaUpdate().set(WbsTreeContract::getIsDeleted, 1).in(WbsTreeContract::getPKeyId, ids));
     }
 
     @Override

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/MixProportionInfoMapper.java

@@ -41,4 +41,6 @@ public interface MixProportionInfoMapper extends BaseMapper<MixProportionInfo> {
     List<String> designStrengthList(@Param("contractId") Long contractId);
 
     Integer compareInfo(@Param("number") Set<String> number,@Param("strength") Set<String> strength,@Param("contractId") Long contractId);
+
+    String getExcelUrlByPKeyId(@Param("pKeyId") Long pKeyId);
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/MixProportionInfoMapper.xml

@@ -21,4 +21,8 @@
         from m_mix_proportion_info
         WHERE is_deleted = 0 and contract_id = #{contractId}
     </select>
+    <select id="getExcelUrlByPKeyId" resultType="java.lang.String">
+        select html_url from m_wbs_tree_contract
+        WHERE p_key_id = #{pKeyId}
+    </select>
 </mapper>

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IMixProportionInfoService.java

@@ -7,6 +7,8 @@ import org.springblade.manager.entity.MixProportionInfo;
 import org.springblade.manager.entity.RawMaterialsInfo;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -19,5 +21,5 @@ public interface IMixProportionInfoService extends BaseService<MixProportionInfo
 
     R importMixProportionInfo(MultipartFile file, Long projectId, Long contractId);
 
-    R calculateWater(MoistureContentDTO dto);
+    R calculateWater(MoistureContentDTO dto) throws IOException;
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArTreeContractInitServiceImpl.java

@@ -318,10 +318,7 @@ public class ArTreeContractInitServiceImpl {
 
         for (ArchiveTreeContractVO2 ar : archiveTreeContractVO2s) {
             //关联质检资料
-            if (ar.getAssociationType() != null
-                    && ar.getAssociationType() == 1
-                    && ar.getDisplayHierarchy() != null
-                    &&  ar.getStorageType() != null &&  ar.getStorageType() == 4) {
+            if (ar.IsQualityAssociationNode()) {
                 List<ArchiveTreeContract> tmpList = getTreeContractFromWbs(tenantId, projectId, wbsId, ar);
                 addNodes.addAll(tmpList);
             }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeContractSyncImpl.java

@@ -3,6 +3,9 @@ package org.springblade.manager.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springblade.archive.entity.ArchiveProjectConfig;
+import org.springblade.archive.feign.ArchiveAutoClient;
 import org.springblade.business.entity.ArchiveFile;
 import org.springblade.business.entity.InformationQuery;
 import org.springblade.business.feign.ArchiveFileClient;
@@ -49,6 +52,8 @@ public class ArchiveTreeContractSyncImpl {
 
     private ExecutorService executorService;
 
+    private final ArchiveAutoClient archiveAutoClient;
+
 
     /**
      * 普通同步
@@ -181,9 +186,13 @@ public class ArchiveTreeContractSyncImpl {
         ArchiveTreeContractVO2 dstTree = ForestNodeMergerEx.getSubTree(dstTrees, dstNodeId);
 
         List<ArchiveTreeContract> saveList = new ArrayList<>();
-        //todo 等测试OK再打开
-        //saveList =arTreeContractInitService.getContractExtNodes(AuthUtil.getTenantId(),projectId,dstTree);
 
+        ArchiveProjectConfig archiveProjectConfig = archiveAutoClient.getByProjectIdOrNew(projectId);
+        //测试阶段，必须打开项目配置才能同步wbs节点
+        if (archiveProjectConfig!= null && archiveProjectConfig.getFactorType().contains("6")) {
+            //todo 等测试OK再打开
+            saveList =arTreeContractInitService.getContractExtNodes(AuthUtil.getTenantId(),projectId,dstTree);
+        }
         return saveList;
     }
 
@@ -452,6 +461,8 @@ public class ArchiveTreeContractSyncImpl {
         //更新的文件
         List<ArchiveFile> updateArchiveFiles = new ArrayList<>();
 
+        Map<Long,String> updateMap = new HashMap<>();
+
         //遍历，所有已归档文件
         for (InformationQuery info: informationQueryList) {
             Long keyId = info.getWbsId();
@@ -484,10 +495,19 @@ public class ArchiveTreeContractSyncImpl {
                 else if (!archiveFile.getPdfFileUrl().equals(info.getEVisaPdfUrl())
                         || (!sort.equals(archiveFile.getSort()))) {
 
+                    if (updateMap.get(archiveFile.getId())!= null) {
+                        continue;
+                    }
+
+                    if (StringUtils.isEmpty(info.getEVisaPdfUrl())) {
+                        continue;
+                    }
+
                     //需要更新的
                     //todo 后续需增加判断已组件或者锁定的不要更新？
                     archiveFile.setPdfFileUrl(info.getEVisaPdfUrl());
                     archiveFile.setEVisaFile(info.getEVisaPdfUrl());
+
                     archiveFile.setFilePage(info.getEVisaPdfPage());
                     archiveFile.setFileSize(info.getEVisaPdfSize());
                     archiveFile.setIsCertification(1);
@@ -495,6 +515,8 @@ public class ArchiveTreeContractSyncImpl {
                     archiveFile.setFileTime(info.getBusinessTime());
                     archiveFile.setSort(sort);
                     updateArchiveFiles.add(archiveFile);
+
+                    updateMap.put(archiveFile.getId(),"1");
                 }
             }
         }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -14,6 +14,7 @@ import com.mixsmart.utils.FormulaUtils;
 import com.mixsmart.utils.ListUtils;
 import com.mixsmart.utils.RegexUtils;
 import com.spire.xls.FileFormat;
+import com.spire.xls.Worksheet;
 import lombok.AllArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -614,24 +615,25 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 }
                 //获取数据库信息
                 ExcelTab excelTab = baseMapper.selectById(Long.parseLong(tabId));
-                //上传新文件到文件服务器
-                byte[] officeByte = IoUtil.readToByteArray(inputStream);
 
-                FileOutputStream fs = new FileOutputStream(dataUrl);
-                fs.write(officeByte);
-                fs.flush();
+                //上传新文件到文件服务器
+                //excel修改 同步修改html 对象
+                String thmlUrl = file_path + filecode + ".html";
+                FileUtils.excelInfo(inputStream,dataUrl,thmlUrl,"2");
                 BladeFile bladeFile = newIOSSClient.uploadFile(excelTab.getExtension(), dataUrl);
                 //获取文件大小
-                int size = connection.getContentLength() / 1024 / 1024; //单位M
+               int size = connection.getContentLength() / 1024 / 1024; //单位M
                 excelTab.setAttachSize(Long.parseLong(size + ""));
                 excelTab.setStatus(3);
                 excelTab.setFileUrl(bladeFile.getLink());
+                excelTab.setHtmlUrl(thmlUrl);
                 baseMapper.updateById(excelTab);
-                File file = new File(dataUrl);
-               /* if (file.exists()) {
-                    file.delete();
-                }*/
-                System.out.println("123456");
+
+                File file2 = new File(dataUrl);
+                if (file2.exists()) {
+                    file2.delete();
+                }
+                inputStream.close();
             } catch (Exception e) {
                 editCallback.setError(1);
                 e.printStackTrace();
@@ -1530,7 +1532,12 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                                             if(StringUtils.isNotEmpty(dataJson)){
                                                 JSONArray jsonArray = JSONArray.parseArray(dataJson);
                                                 List<Integer> idList = Func.toIntList(myData);
-                                                String dataInfo = jsonArray.getJSONObject(idList.get(0)-1).getString("name");
+                                                int indexx = 0;
+                                                if(idList.get(0)>=1){
+                                                    indexx =idList.get(0)-1;
+                                                }
+
+                                                String dataInfo = jsonArray.getJSONObject(indexx).getString("name");
                                                 for(int inx=1 ; inx<idList.size() ; inx++){
                                                    int valIndex = idList.get(inx)-1;
                                                     dataInfo = dataInfo+"，"+jsonArray.getJSONObject(valIndex).getString("name");

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/MixProportionInfoServiceImpl.java

@@ -7,6 +7,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import javassist.runtime.DotClass;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
 import org.springblade.common.utils.ForestNodeMergerEx;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.excel.util.ExcelUtil;
@@ -17,6 +21,8 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.IoUtil;
+import org.springblade.core.tool.utils.ResourceUtil;
 import org.springblade.manager.dto.ArchiveTreeContractAutoRuleMapDTO;
 import org.springblade.manager.dto.ArchiveTreeDTO;
 import org.springblade.manager.dto.ArchiveTreeSortDTO;
@@ -38,6 +44,10 @@ import org.springblade.manager.vo.WbsTreeVO2;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -121,13 +131,38 @@ public class MixProportionInfoServiceImpl extends BaseServiceImpl<MixProportionI
      * @return
      */
     @Override
-    public R calculateWater(MoistureContentDTO dto) {
+    public R calculateWater(MoistureContentDTO dto) throws IOException {
         if (StringUtils.isBlank(dto.getDesignStrength())){
             throw new ServiceException("请先选择设计强度");
         }
+        //获取表单，获取配合比位置
+        String url = baseMapper.getExcelUrlByPKeyId(dto.getKeyId());
+        // 读取html页面信息
+        File file1 = ResourceUtil.getFile(url);
+//        File file1 = ResourceUtil.getFile("C:\\Users\\泓创研发01\\Desktop\\privateUrl\\1694957051815395328.html");
+        FileInputStream inputStream = new FileInputStream(file1);
+        String htmlString = IoUtil.readToString(inputStream);
+        Document doc = Jsoup.parse(htmlString);
+        Element table = doc.select("table").first();
+        Elements td = table.select("td");
+        Boolean isFiled = false;
+        String key = "";
+        for (Element element : td) {
+            if (isFiled){
+                key = element.childNodes().get(1).attr("keyname");
+                break;
+            }
+            if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(element.text()) && element.text().equals("施工配合比")){
+                isFiled = true;
+            }
+        }
+        if (!isFiled){
+            inputStream.close();
+            return R.data(null);
+        }
         //获取位置前缀后缀
-        String prefix= dto.getKey().replaceAll("__[\\d_]+", "");
-        String suffix = dto.getKey().replaceAll("key_\\d+__", "");
+        String prefix= key.replaceAll("__[\\d_]+", "");
+        String suffix = key.replaceAll("key_\\d+__", "");
         String[] split = suffix.split("_");
         String s1 = split[0];
         Integer s2 = Integer.parseInt(split[1]);
@@ -138,6 +173,7 @@ public class MixProportionInfoServiceImpl extends BaseServiceImpl<MixProportionI
                 .eq(MixProportionInfo::getContractId,dto.getContractId())
                 .eq(MixProportionInfo::getDesignStrength,dto.getDesignStrength()));
         if (info == null){
+            inputStream.close();
             throw new ServiceException("获取配合比信息失败");
         }
         //含水量计算
@@ -193,6 +229,7 @@ public class MixProportionInfoServiceImpl extends BaseServiceImpl<MixProportionI
         //矿渣粉
         BigDecimal slagPowder = info.getSlagPowder();
         map.put(prefix + "__" +s1 + "_" +(s2+8),slagPowder);
+        inputStream.close();
         return R.data(map);
     }
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/utils/FTPUtils.java

@@ -2,6 +2,8 @@ package org.springblade.manager.utils;
 
 import org.apache.commons.net.ftp.FTPClient;
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -35,20 +37,22 @@ public class FTPUtils {
     }
 
     //文件覆盖上传
-/*    public static void main(String[] args) throws Exception {
+    public static void main1(String[] args) throws Exception {
 
-        InputStream input = FileUtils.getInputStreamByUrl("http://192.168.0.109:6371/1534807810770993152.html");
+       // InputStream input = FileUtils.getInputStreamByUrl("http://192.168.0.109:6371/1534807810770993152.html");
+        String dataUrl = "/Users/hongchuangyanfa/Desktop/预览图_千图网_编号357539942.jpg";
+        InputStream input = new FileInputStream(new File(dataUrl));
 
         FTPUtils ftpUtils = new FTPUtils();
         try {
             FTPClient ftp = ftpUtils.getFTPClinet();
             // 获取本地文件并上传
 
-            ftp.changeWorkingDirectory("/Desktop/");//跳转目录
+            ftp.changeWorkingDirectory("/localArchive/");//跳转目录
             ftp.setFileType(FTPClient.BINARY_FILE_TYPE);//必须要设置以二进制的方式传输文件
             ftp.enterLocalPassiveMode();//被动模式
 
-            if (!ftp.storeFile("1534807810770993152.html", input)) {
+            if (!ftp.storeFile("1534807810770993152.jpg", input)) {
                 System.out.println("失败，服务器返回:" + ftp.getReplyString());//获取上传失败的原因
             } else {
                 System.out.println("文件:1534807810770993152.html 上传成功");
@@ -58,6 +62,6 @@ public class FTPUtils {
         } catch (IOException e) {
             System.out.println("ftp连接失败");
         }
-    }*/
+    }
 
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/utils/FileUtils.java

@@ -1,11 +1,16 @@
 package org.springblade.manager.utils;
 
+import com.aliyun.oss.common.utils.DateUtil;
 import com.aspose.cells.SaveFormat;
 import com.aspose.cells.Workbook;
 import com.itextpdf.text.Document;
 import com.itextpdf.text.pdf.PdfCopy;
 import com.itextpdf.text.pdf.PdfReader;
 import com.spire.xls.*;
+import com.spire.xls.CellRange;
+import com.spire.xls.collections.CommentsCollection;
+import com.spire.xls.core.INamedRange;
+import com.spire.xls.core.spreadsheet.HTMLOptions;
 import com.sun.image.codec.jpeg.JPEGCodec;
 import com.sun.image.codec.jpeg.JPEGImageEncoder;
 import org.apache.commons.lang.StringUtils;
@@ -29,9 +34,7 @@ import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.common.utils.SystemUtils;
 import org.springblade.common.vo.DataVO;
 import org.springblade.core.tool.api.ResultCode;
-import org.springblade.core.tool.utils.FileUtil;
-import org.springblade.core.tool.utils.IoUtil;
-import org.springblade.core.tool.utils.ResourceUtil;
+import org.springblade.core.tool.utils.*;
 import org.springblade.system.cache.ParamCache;
 
 import javax.imageio.ImageIO;
@@ -40,6 +43,8 @@ import java.awt.image.BufferedImage;
 import java.io.*;
 import java.net.URL;
 import java.net.URLEncoder;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.zip.ZipEntry;
@@ -305,12 +310,6 @@ public class FileUtils {
         }
     }
 
-    public static void main11(String[] args) {
-        String excelPath="/Users/hongchuangyanfa/Downloads/A11 施工放样报验单 (1).xlsx";
-        String pdfPath="/Users/hongchuangyanfa/Downloads/A11 施工放样报验单 (1).pdf";
-
-        FileUtils.setExcelScaleToPdf(excelPath, pdfPath);
-    }
 
     /**
      * excel设置 打印缩放比例
@@ -347,7 +346,7 @@ public class FileUtils {
                 sheet.setHorizontallyCenter(true);//设置打印页面为水平居中
                 sheet.setVerticallyCenter(true);
                 sheet.setAutobreaks(true);
-               // printSetup.setLandscape(false);
+                // printSetup.setLandscape(false);
                 sheet.setMargin(XSSFSheet.BottomMargin, (double) 0.1);// 页边距（下）
                 sheet.setMargin(XSSFSheet.LeftMargin, (double) 0.7);// 页边距（左）
                 sheet.setMargin(XSSFSheet.RightMargin, (double) 0.7);// 页边距（右）
@@ -355,9 +354,9 @@ public class FileUtils {
                 printSetup.setScale((short) 100);//自定义缩放①，此处100为无缩放
                 System.out.print(sheet.getAutobreaks());
                 printSetup.setPaperSize(HSSFPrintSetup.A4_PAPERSIZE);
-              //  printSetup.setFitHeight((short) 1);//设置高度为自动分页
-               // printSetup.setFitWidth((short) 1);//设置宽度为一页
-               // sheet.setFitToPage(true);
+                //  printSetup.setFitHeight((short) 1);//设置高度为自动分页
+                // printSetup.setFitWidth((short) 1);//设置宽度为一页
+                // sheet.setFitToPage(true);
             }
             // Excel文件生成后存储的位置。
             outReport = new ByteArrayOutputStream();
@@ -415,4 +414,189 @@ public class FileUtils {
         return file_path;
     }
 
+
+    public static void main123(String[] args) throws Exception {
+       String excelUrl = "/Users/hongchuangyanfa/Downloads/C4.13路基压实度汇总表.xlsx";
+        String old_html = "/Users/hongchuangyanfa/Desktop/pdf/old_html.html";
+        String old_xlsx = "/Users/hongchuangyanfa/Desktop/pdf/old_html.xlsx";
+
+      //  File data = new File(excelUrl);
+      //  InputStream inputStream = new FileInputStream(data);
+      //  excelInfo(inputStream,old_xlsx,old_html,"1");
+
+        String new_html = "/Users/hongchuangyanfa/Desktop/pdf/new_html.html";
+        String new_xlsx = "/Users/hongchuangyanfa/Desktop/pdf/new_html.xlsx";
+
+        File data = new File(old_xlsx);
+        InputStream inputStream = new FileInputStream(data);
+        excelInfo(inputStream,new_xlsx,new_html,"2");
+    }
+
+
+    /**
+     * 在线编辑excel 操作
+     *
+     * @param fileInputStream
+     * @param excelURL
+     * @param htmlUrl
+     * @throws Exception
+     */
+    public static void excelInfo(InputStream fileInputStream, String excelURL, String htmlUrl, String type) {
+        try {
+            String file_path = FileUtils.getSysLocalFileUrl() + "/pdf/";
+            String filecode = SnowFlakeUtil.getId() + "";
+            String thmlUrl2 = file_path + filecode + "123.html";
+
+            // 解析原始excel
+            com.spire.xls.Workbook wb = new com.spire.xls.Workbook();
+            wb.loadFromMHtml(fileInputStream);
+
+            wb.saveToFile(excelURL, FileFormat.Version2013);
+            // 操作
+            com.spire.xls.Workbook wb2 = new com.spire.xls.Workbook();
+            wb2.loadFromMHtml(excelURL);
+            Worksheet sheet2 = wb2.getWorksheets().get(0);
+
+            HTMLOptions options = new HTMLOptions();
+            options.setImageEmbedded(true);
+            //获取工作表
+            Worksheet sheet = wb.getWorksheets().get(0);
+            sheet.saveToHtml(htmlUrl, options);
+
+            CellRange[] mergedCells = sheet.getMergedCells();
+            Map<String, Map<String, Integer>> xyList = new HashMap<>();
+
+            CellRange[] cellRanges = sheet.getCells();
+
+            int j = 0;
+            int maxVal = 0;
+
+            for (int i = 0; i < cellRanges.length; i++) {
+                CellRange oldcell = cellRanges[i];
+                CellRange mergedCell = sheet.getCellRange(oldcell.getRow(), oldcell.getColumn());
+                String data = mergedCell.getDataValidation().getErrorMessage();
+                int k = 0;
+                if(Func.isNumeric(data)){
+                    k = Func.toInt(data);
+                }
+                if (maxVal < k) {
+                        maxVal = k;
+                }
+            }
+
+            for (int i = 0; i < mergedCells.length; i++) {
+                Map<String, Integer> dataMap = new HashMap<>();
+                CellRange oldcell = mergedCells[i];
+                CellRange mergedCell = sheet.getCellRange(oldcell.getRow(), oldcell.getColumn());
+                String data = mergedCell.getDataValidation().getErrorMessage();
+                System.out.println(mergedCell.getValue()+"---"+data);
+                if (StringUtils.isEmpty(data)) {
+                    if(maxVal<=0){
+                        j = j + 1;
+                    }else{
+                        maxVal = maxVal+1;
+                        j=maxVal;
+                    }
+                } else {
+                    if(Func.isNumeric(data)){
+                        j = Func.toInt(data);
+                    }else {
+                        j = Func.toInt((data.trim().replaceAll("\r|\n", "")).split(":")[1] + "");
+                    }
+                }
+                // 目标表添加备注信息
+                sheet2.getCellRange(oldcell.getRow(), oldcell.getColumn()).getDataValidation().setErrorMessage(j+"");
+                mergedCell.getDataValidation().setErrorMessage(j+"");
+                mergedCell.setValue(j + "");
+                dataMap.put("x1", mergedCell.getRow());
+                dataMap.put("x2", mergedCell.getLastRow());
+                dataMap.put("y1", mergedCell.getColumn());
+                dataMap.put("y2", mergedCell.getLastColumn());
+                xyList.put(j + "", dataMap);
+            }
+
+            // 单个cell
+            for (int i = 0; i < cellRanges.length; i++) {
+                CellRange oldcell = cellRanges[i];
+                CellRange mergedCell = sheet.getCellRange(oldcell.getRow(), oldcell.getColumn());
+                String data = mergedCell.getDataValidation().getErrorMessage();
+                Map<String, Integer> dataMap = new HashMap<>();
+                if (StringUtils.isEmpty(data)) {
+                    if(maxVal<=0){
+                        j = j + 1;
+                    }else{
+                        maxVal = maxVal+1;
+                        j=maxVal;
+                    }
+                } else {
+                    if(Func.isNumeric(data)){
+                        j = Func.toInt(data);
+                    }else {
+                        j = Func.toInt((data.trim().replaceAll("\r|\n", "")).split(":")[1] + "");
+                    }
+                }
+                sheet2.getCellRange(oldcell.getRow(), oldcell.getColumn()).getDataValidation().setErrorMessage(j+"");
+                oldcell.getComment().getRichText().setText(j + "");
+                mergedCell.setValue(j + "");
+                dataMap.put("x1", mergedCell.getRow());
+                dataMap.put("x2", mergedCell.getLastRow());
+                dataMap.put("y1", mergedCell.getColumn());
+                dataMap.put("y2", mergedCell.getLastColumn());
+                xyList.put(j + "", dataMap);
+            }
+            sheet.saveToHtml(thmlUrl2, options);
+
+            // 上传excel文件
+            wb2.saveToFile(excelURL, FileFormat.Version2013);
+
+            // 组装坐标
+            File html1 = new File(htmlUrl);  // 原始html
+            File html2 = new File(thmlUrl2); // 坐标html
+            InputStream inputStream1 = new FileInputStream(html1);
+            InputStream inputStream2 = new FileInputStream(html2);
+            String htmlString1 = IoUtil.readToString(inputStream1);
+            String htmlString2 = IoUtil.readToString(inputStream2);
+
+            org.jsoup.nodes.Document doc1 = Jsoup.parse(htmlString1);
+            Element table1 = doc1.select("table").first();
+            Elements trs1 = table1.select("tr");
+            org.jsoup.nodes.Document doc2 = Jsoup.parse(htmlString2);
+            Element table2 = doc2.select("table").first();
+            Elements trs2 = table2.select("tr");
+
+            for (int i = 0; i < trs1.size(); i++) {
+                Elements td1 = trs1.get(i).select("td");
+                Elements td2 = trs2.get(i).select("td");
+                for (int x = 0; x < td1.size(); x++) {
+                    Element cell1 = td1.get(x);
+                    if (cell1.children().size() >= 1) {
+                        cell1.empty();
+                    }
+                    Element cell2 = td2.get(x);
+                    String html = cell2.text();
+                    Map<String, Integer> xyMap = xyList.get(html);
+                    if (xyMap != null) {
+                        cell1.attr("x1", xyMap.get("x1") + "");
+                        cell1.attr("x2", xyMap.get("x2") + "");
+                        cell1.attr("y1", xyMap.get("y1") + "");
+                        cell1.attr("y2", xyMap.get("y2") + "");
+                        cell1.attr("exceVal",html);
+                    }
+                }
+            }
+
+            File writeFile = new File(htmlUrl);
+            FileUtil.writeToFile(writeFile, doc1.html(), Boolean.parseBoolean("UTF-8"));
+            if (html2.exists()) {
+                html2.delete();
+            }
+            fileInputStream.close();
+            wb2.dispose();
+            wb.dispose();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
 }