表单提交

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ExctabCell.java

@@ -54,32 +54,21 @@ public class ExctabCell implements Serializable {
 	* 清表Id
 	*/
 		private Long exctabId;
-	/**
-	* tr下标
-	*/
-		private Integer trIndex;
-	/**
-	* td下标
-	*/
-		private Integer tdIndex;
-	/**
-	* 合并行格数
-	*/
-		private Integer colIndex;
-	/**
-	* 合并列格数
-	*/
-		private Integer rowIndex;
+
 	/**
 	* 文本信息
 	*/
 		private String textInfo;
 
+	/**
+	 * 坐标值
+	 */
+	private String xys;
+
 	/**
 	 * 是否已删除
 	 */
 	@TableLogic
 	@ApiModelProperty(value = "是否已删除")
 	private Integer isDeleted;
-
 }

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

@@ -43,6 +43,7 @@ import org.springblade.manager.entity.*;
 import org.springblade.manager.mapper.WbsTreePrivateMapper;
 import org.springblade.manager.service.*;
 import org.springblade.manager.unit.FileUtils;
+import org.springblade.manager.unit.HtmlToPdf;
 import org.springblade.manager.vo.*;
 import org.springblade.manager.wrapper.ExcelTabWrapper;
 import org.springblade.resource.feign.CommonFileClient;
@@ -82,7 +83,7 @@ public class ExcelTabController extends BladeController {
     // wes 基本信息表
     private final IWbsTreeService wbsTreeService;
     // excel 解析结构
-    //private final IExctabCellService exctabCellService;
+    private final IExctabCellService exctabCellService;
 
     private final IOSSClient iossClient;
 
@@ -284,9 +285,9 @@ public class ExcelTabController extends BladeController {
     @GetMapping("/getWbsTypeList")
     @ApiOperationSupport(order = 10)
     @ApiOperation(value = "清表编辑 wbs 下拉框选择", notes = "传入excelTab")
-    @ApiImplicitParams(value = {@ApiImplicitParam(name = "wbstype", value = "wbstype", required = true)})
-    public R getWbsTypeList(Integer wbstype) {
-        List<ExcelTabWbsTypeVO> wbsTypeList= excelTabService.getWbsTypeList(wbstype);
+    @ApiImplicitParams(value = {@ApiImplicitParam(name = "wbsType", value = "wbsType", required = true)})
+    public R getWbsTypeList(Integer wbsType) {
+        List<ExcelTabWbsTypeVO> wbsTypeList= excelTabService.getWbsTypeList(wbsType);
         return R.data(wbsTypeList);
     }
 
@@ -309,7 +310,7 @@ public class ExcelTabController extends BladeController {
             }
         }
         if(wbsType==2){ // 私有项目wbs 树
-            List<WbsTreeVO> tree = excelTabService.lazyTree(wbsId, Func.toStrWithEmpty(null, bladeUser.getTenantId()), parentId);
+            List<WbsTreeVO> tree = excelTabService.lazyTreeByPri(wbsId, Func.toStrWithEmpty(null, bladeUser.getTenantId()), parentId);
             if (tree != null && tree.size() > 0) {
                 return R.data(tree);
             }
@@ -369,10 +370,10 @@ public class ExcelTabController extends BladeController {
             for (ExcelTabWbsTypeVO info : linkDataInfo){
                 String[] pk_id = info.getLinkIds().split(",");
                 for(String pkInfo : pk_id){
-
                     UpdateWrapper<WbsTreePrivate> updateWrapper = new UpdateWrapper<>();
-                    updateWrapper.in("p_key_id",Long.parseLong(pkInfo));
-                    updateWrapper.set("is_link_table",2);
+                    String [] pk_type = pkInfo.trim().split("_");
+                    updateWrapper.in("p_key_id",Long.parseLong(pk_type[0]));
+                    updateWrapper.set("is_link_table",Integer.parseInt(pk_type[1]));
                     updateWrapper.set("excel_id",excelTab.getId());
                     wbsTreePrivateService.update(updateWrapper);
                 }
@@ -568,12 +569,13 @@ public class ExcelTabController extends BladeController {
     @ApiOperationSupport(order = 13)
     @ApiOperation(value = "填报页面数据保存", notes = "填报页面数据保存")
     public R<String> saveBussData(@Valid @RequestBody JSONObject dataInfo, BladeUser bladeUser) {
-        JSONObject jsonObject = dataInfo.getJSONObject("dataInfo");
+
         JSONArray dataArray = new JSONArray();
-        if(jsonObject.containsKey("orderList")){ // 节点保存
+        if(dataInfo.containsKey("dataInfo")){ // 节点保存
+            JSONObject jsonObject = dataInfo.getJSONObject("dataInfo");
             dataArray = jsonObject.getJSONArray("orderList");
         }else{ // 单个保存
-            dataArray.add(jsonObject);
+            dataArray.add(dataInfo);
         }
 
        for(int m=0;m<dataArray.size();m++){
@@ -696,7 +698,7 @@ public class ExcelTabController extends BladeController {
         return  R.success("1");
     }
 
-
+    // 上传解析 html
     public void expailHtmlInfo(String thmlUrl,Long excelId) throws FileNotFoundException {
 
         // 读取
@@ -835,7 +837,6 @@ public class ExcelTabController extends BladeController {
                         List<Map<String,String>> top = new ArrayList<>();
                         for(int k=0 ; k< zikey.size() ;k++){
                             String name = zikey.get(k).get("name");
-                            //  String name2 = zikey.get(k).get("name").replaceAll("[^\u4E00-\u9FA5]", "");
                             int xx1 = Integer.parseInt( zikey.get(k).get("x1"));
                             int xx2 = Integer.parseInt( zikey.get(k).get("x2"));
                             int yy1 = Integer.parseInt( zikey.get(k).get("y1"));
@@ -896,59 +897,75 @@ public class ExcelTabController extends BladeController {
                             exctabCell.setExctabId(excelId);
                             exctabCell.setTextInfo("签字时间");
                             exctabCell.setIsDeleted(0);
-                            exctabCell.setTrIndex(i);
-                            exctabCell.setTdIndex(j);
+                            exctabCell.setXys(i+"_"+j);
+                            colTitle.add(exctabCell);
                         }else {
                             String parm = i+","+j+","+x1+","+x2+","+y1+","+y2+",$event";
                             if(index_state){
                                 if(rowspan>=1){
-                                    data.empty().append("<el-input type='textarea'  @contextmenu.prevent.native='RightClick("+parm+")' trIndex="+i+" tdIndex="+j+"  x1="+x1+" x2="+x2+" y1="+y1+" y2="+y2+" style='width:100%;height:100%;background-color: #edc9a2'   :rows="+rowspan*2+" placeholder=''> </el-input>");
+                                    data.empty().append("<el-input type='textarea'  @contextmenu.prevent.native='RightClick("+parm+")' trIndex="+i+" tdIndex="+j+"  x1="+x1+" x2="+x2+" y1="+y1+" y2="+y2+" style='width:100%;height:100%;'   :rows="+rowspan*2+" placeholder=''> </el-input>");
                                 }else{
-                                    data.empty().append("<el-input type='text'  @contextmenu.prevent.native='RightClick("+parm+")' trIndex="+i+" tdIndex="+j+"  x1="+x1+" x2="+x2+" y1="+y1+" y2="+y2+" style='width:100%;height:100%;background-color: #edc9a2' placeholder=''> </el-input>");
+                                    data.empty().append("<el-input type='text'  @contextmenu.prevent.native='RightClick("+parm+")' trIndex="+i+" tdIndex="+j+"  x1="+x1+" x2="+x2+" y1="+y1+" y2="+y2+" style='width:100%;height:100%;' placeholder=''> </el-input>");
                                 }
                             }else{
                                 if(j==0 ){
                                     if(colspan ==maxCol && i>=1 && i<=2){
                                         if(rowspan>=1){
-                                            data.empty().append("<el-input type='textarea'  @contextmenu.prevent.native='RightClick("+parm+")' trIndex="+i+" tdIndex="+j+"  x1="+x1+" x2="+x2+" y1="+y1+" y2="+y2+" style='width:100%;height:100%;background-color: #edc9a2'   :rows="+rowspan*2+" placeholder=''> </el-input>");
+                                            data.empty().append("<el-input type='textarea'  @contextmenu.prevent.native='RightClick("+parm+")' trIndex="+i+" tdIndex="+j+"  x1="+x1+" x2="+x2+" y1="+y1+" y2="+y2+" style='width:100%;height:100%;'   :rows="+rowspan*2+" placeholder=''> </el-input>");
                                         }else{
-                                            data.empty().append("<el-input type='text' @contextmenu.prevent.native='RightClick("+parm+")' trIndex="+i+" tdIndex="+j+"  x1="+x1+" x2="+x2+" y1="+y1+" y2="+y2+" style='width:100%;height:100%;background-color: #edc9a2' placeholder=''> </el-input>");
+                                            data.empty().append("<el-input type='text' @contextmenu.prevent.native='RightClick("+parm+")' trIndex="+i+" tdIndex="+j+"  x1="+x1+" x2="+x2+" y1="+y1+" y2="+y2+" style='width:100%;height:100%;' placeholder=''> </el-input>");
                                         }
                                     }
                                 }else{
                                     Element bforData = tds.get(j-1);
                                     if(!bforData.text().isEmpty()){
                                         if(rowspan>=1){
-                                            data.empty().append("<el-input type='textarea' @contextmenu.prevent.native='RightClick("+parm+")' trIndex="+i+" tdIndex="+j+"  x1="+x1+" x2="+x2+" y1="+y1+" y2="+y2+" style='width:100%;height:100%;background-color: #edc9a2'   :rows="+rowspan*2+" placeholder=''> </el-input>");
+                                            data.empty().append("<el-input type='textarea' @contextmenu.prevent.native='RightClick("+parm+")' trIndex="+i+" tdIndex="+j+"  x1="+x1+" x2="+x2+" y1="+y1+" y2="+y2+" style='width:100%;height:100%;'   :rows="+rowspan*2+" placeholder=''> </el-input>");
                                         }else{
-                                            data.empty().append("<el-input  type='text' @contextmenu.prevent.native='RightClick("+parm+")' trIndex="+i+" tdIndex="+j+"  x1="+x1+" x2="+x2+" y1="+y1+" y2="+y2+" style='width:100%;height:100%;background-color: #edc9a2' placeholder=''> </el-input>");
+                                            data.empty().append("<el-input  type='text' @contextmenu.prevent.native='RightClick("+parm+")' trIndex="+i+" tdIndex="+j+"  x1="+x1+" x2="+x2+" y1="+y1+" y2="+y2+" style='width:100%;height:100%;' placeholder=''> </el-input>");
                                         }
                                     }
                                 }
                             }
-                            exctabCell.setExctabId(excelId);
-                            exctabCell.setTextInfo(inputText.replaceAll("[^(\u4E00-\u9FA5_)]", ""));
-                            exctabCell.setIsDeleted(0);
-                            exctabCell.setTrIndex(i);
-                            exctabCell.setTdIndex(j);
+                            if(!inputText.equals("")){
+                                System.out.println(inputText);
+                                exctabCell.setExctabId(excelId);
+                                exctabCell.setTextInfo(inputText.replaceAll("[^(\u4E00-\u9FA5_)]", ""));
+                                exctabCell.setIsDeleted(0);
+                                exctabCell.setXys(i+"_"+j);
+                                colTitle.add(exctabCell);
+                            }
                         }
                         data.attr("title",inputText.replaceAll("[^(\u4E00-\u9FA5_)]", ""));
-                        colTitle.add(exctabCell);
+
                     }
                 }
             }
         }
 
         // 去掉重复的数据
-        //colTitle.stream().collect(toMap(ExctabCell::getTextInfo, identity());
-        //	List<ExctabCell> distinctList = colTitle.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(ExctabCell::getTextInfo))), ArrayList::new));
-        // exctabCellService.saveBatch(colTitle);
+
+        Map<String, String> groupMap2 = colTitle.stream()
+                .collect(Collectors.groupingBy(ExctabCell::getTextInfo, Collectors.mapping(ExctabCell::getXys, Collectors.joining(","))));
+
+        exctabCellService.DeletExcelByTableId(excelId+"");
+
+        List<ExctabCell> colTitle2 = new ArrayList<>();
+        for (String title:groupMap2.keySet()){
+            ExctabCell exctabCell = new ExctabCell();
+            exctabCell.setExctabId(excelId);
+            exctabCell.setIsDeleted(0);
+            exctabCell.setTextInfo(title);
+            exctabCell.setXys(groupMap2.get(title));
+            colTitle2.add(exctabCell);
+        }
+         exctabCellService.saveBatch(colTitle2);
+
         // 保存
         File writefile = new File(thmlUrl);
         FileUtil.writeToFile(writefile, doc.html(), Boolean.parseBoolean("UTF-8"));
     }
 
-
     //计算区域坐标
     public static String getTrInfo(Elements tds,Map<String ,String > styleMap,boolean index_state,Integer xy_type,int maxCol){
 
@@ -1125,8 +1142,7 @@ public class ExcelTabController extends BladeController {
             @ApiImplicitParam(name = "pkeyId", value = "pkeyId", required = true)
     })
     public R getBussPdfInfo(Long pkeyId) throws IOException {
-        String fontPath ="/Users/hongchuangyanfa/tool/simhei.ttf";
-        ConverterProperties properties = creatBaseFont(fontPath);
+
         WbsTreeContract wbsTreeContract = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>query().lambda()
                 .eq(WbsTreeContract::getPKeyId, pkeyId));
 
@@ -1178,13 +1194,13 @@ public class ExcelTabController extends BladeController {
         }
 
         String pdfPath="/Users/hongchuangyanfa/Desktop/pdf//"+pkeyId+".pdf";
+        String pdfHtmlPath="/Users/hongchuangyanfa/Desktop/pdfHtml//"+pkeyId+".pdf";
+
+        File writefile = new File(pdfHtmlPath);
+        FileUtil.writeToFile(writefile, doc.html(), Boolean.parseBoolean("UTF-8"));
 
-        File pdffile = ResourceUtil.getFile(pdfPath);
-        PdfWriter writer = new PdfWriter(pdffile);
-        com.itextpdf.kernel.pdf.PdfDocument pdf = new PdfDocument(writer);
-        PageSize pageSize = new PageSize(795,842);
-        pdf.setDefaultPageSize(pageSize);
-        HtmlConverter.convertToPdf(doc.html(),writer,properties);
+        HtmlToPdf html = new HtmlToPdf();
+        html.tomPdf(pdfHtmlPath,pdfPath);
 
         BladeFile bladeFile = newIOSSClient.uploadFile(pkeyId + ".pdf", pdfPath);
 

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

@@ -124,5 +124,15 @@ public class ExctabCellController extends BladeController {
 		return R.status(exctabCellService.removeByIds(Func.toLongList(ids)));
 	}
 
-	
+
+	/**
+	 *  获取excel 元素信息
+	 */
+	@GetMapping("/getColByTabId")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "获取excel字段信息", notes = "tabId")
+	public R getColByTabId(@ApiParam(value = "主键集合", required = true) @RequestParam String tabId) {
+		return R.data(exctabCellService.getColSelect(tabId));
+	}
+
 }

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

@@ -117,7 +117,7 @@
         parent_id = dept.id and is_deleted = 0 AND type = 1
         ) AS "has_children"
         FROM
-        m_wbs_tree_private dept
+        m_wbs_tree dept
         WHERE
         dept.parent_id = #{parentId} AND dept.is_deleted = 0
         <if test="tenantId!=null and tenantId!=''">
@@ -141,7 +141,7 @@
         SELECT
         CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
         FROM
-        m_wbs_tree
+        m_wbs_tree_private
         WHERE
         parent_id = dept.id and is_deleted = 0 AND type = 1
         ) AS "has_children"
@@ -190,7 +190,7 @@
     </select>
 
     <delete id="removeBussTabInfoById" >
-        delete from m_wbs_tree_contract where p_key_id = #{rId}
+        delete from m_wbs_tree_contract where p_key_id = #{pkeyid}
     </delete>
 
 </mapper>

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

@@ -17,6 +17,7 @@
 package org.springblade.manager.mapper;
 
 import org.springblade.manager.entity.ExctabCell;
+import org.springblade.manager.entity.LinkdataInfo;
 import org.springblade.manager.vo.ExctabCellVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -39,4 +40,10 @@ public interface ExctabCellMapper extends BaseMapper<ExctabCell> {
 	 */
 	List<ExctabCellVO> selectExctabCellPage(IPage page, ExctabCellVO exctabCell);
 
+	/*
+	** 获取excel 元素信息
+	 */
+	List<ExctabCellVO> getColSelect(String tabId);
+
+	Integer DeletExcelByTableId(String tabId);
 }

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

@@ -7,10 +7,7 @@
         <result column="id" property="id"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="exctab_id" property="exctabId"/>
-        <result column="tr_index" property="trIndex"/>
-        <result column="td_index" property="tdIndex"/>
-        <result column="col_index" property="colIndex"/>
-        <result column="row_index" property="rowIndex"/>
+        <result column="xys" property="xys"/>
         <result column="text_info" property="textInfo"/>
     </resultMap>
 
@@ -19,4 +16,11 @@
         select * from m_exctab_cell where is_deleted = 0
     </select>
 
+    <select id="getColSelect" resultMap="exctabCellResultMap">
+        select * from m_exctab_cell where is_deleted = 0 and exctab_id =#{tabId}
+    </select>
+
+    <delete id="DeletExcelByTableId" >
+        delete from m_exctab_cell where exctab_id =#{tabId}
+    </delete>
 </mapper>

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

@@ -14,12 +14,11 @@
         <result column="td_index" property="tdIndex"/>
     </resultMap>
 
-
     <select id="selectLinkdataInfoPage" resultMap="linkdataInfoResultMap">
         select * from m_linkdata_info where is_deleted = 0
     </select>
 
-    <select id="getColSelect" resultMap="linkdataInfoResultMap">
+     <select id="getColSelect" resultMap="linkdataInfoResultMap">
         select * from m_linkdata_info where is_deleted = 0 and tab_id =#{tabId}
     </select>
 </mapper>

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

@@ -18,10 +18,13 @@ package org.springblade.manager.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.manager.entity.ExctabCell;
+import org.springblade.manager.entity.LinkdataInfo;
 import org.springblade.manager.vo.ExctabCellVO;
 import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+
 /**
  * Excel 结构信息表 服务类
  *
@@ -39,4 +42,8 @@ public interface IExctabCellService extends IService<ExctabCell> {
 	 */
 	IPage<ExctabCellVO> selectExctabCellPage(IPage<ExctabCellVO> page, ExctabCellVO exctabCell);
 
+
+	List<ExctabCellVO> getColSelect(String tabId);
+
+	Integer DeletExcelByTableId(String tabId);
 }

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

@@ -19,6 +19,7 @@ package org.springblade.manager.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springblade.manager.entity.ExctabCell;
+import org.springblade.manager.entity.LinkdataInfo;
 import org.springblade.manager.vo.ExctabCellVO;
 import org.springblade.manager.mapper.ExctabCellMapper;
 import org.springblade.manager.service.IExctabCellService;
@@ -45,4 +46,14 @@ public class ExctabCellServiceImpl extends ServiceImpl<ExctabCellMapper, ExctabC
 		return page.setRecords(baseMapper.selectExctabCellPage(page, exctabCell));
 	}
 
+	@Override
+	public List<ExctabCellVO> getColSelect(String tabId) {
+		return baseMapper.getColSelect(tabId);
+	}
+
+	@Override
+	public Integer DeletExcelByTableId(String tabId) {
+		return baseMapper.DeletExcelByTableId(tabId);
+	}
+
 }

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

@@ -372,7 +372,6 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
         //新增元素表、实体表
         if (formElementDTO.getId() == null) {
             this.saveFormElement(formElementDTO);
-
         } else {
             //关联-在已有元素表中新增元素,在实体表中追加字段
             //获取当前元素表中的所有的元素信息

blade-service/blade-manager/src/main/java/org/springblade/manager/unit/HtmlToPdf.java

@@ -1,8 +1,10 @@
 package org.springblade.manager.unit;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.Map;
 
 import com.itextpdf.html2pdf.ConverterProperties;
 import com.itextpdf.html2pdf.HtmlConverter;
@@ -17,6 +19,11 @@ import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
 import com.itextpdf.kernel.pdf.canvas.draw.ILineDrawer;
 import com.itextpdf.layout.Document;
 import com.itextpdf.layout.element.LineSeparator;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+import org.springblade.core.tool.utils.IoUtil;
+import org.springblade.core.tool.utils.ResourceUtil;
 
 /**
  * 利用HTML代码片段生成PDF
@@ -29,13 +36,28 @@ public class HtmlToPdf {
 	public static final String FONT = "/Users/hongchuangyanfa/tool/NotoSansCJKsc-Regular.otf";
 
 	public void tomPdf(String html, String DEST) throws FileNotFoundException, IOException {
+
+		File file1 = ResourceUtil.getFile(html);
+		String htmlString =  IoUtil.readToString(new FileInputStream(file1));
+		org.jsoup.nodes.Document doc = Jsoup.parse(htmlString);
+		//解析
+		Element table = doc.select("table").first();
+		Elements col = doc.select("Col");
+		Elements trs = table.select("tr");
+		int html_max_width = 0;
+		int html_max_heght = trs.size() * 36;
+		for(int i = 0 ; i <col.size();i++){
+			Element element = col.get(i);
+			html_max_width += Integer.parseInt(element.attr("width").replaceAll("px",""));
+		}
+
 		ConverterProperties props = new ConverterProperties();
 		DefaultFontProvider defaultFontProvider = new DefaultFontProvider(false, false, false);
 		defaultFontProvider.addFont(FONT);
 		props.setFontProvider(defaultFontProvider);
 		PdfWriter writer = new PdfWriter(DEST);
 		PdfDocument pdf = new PdfDocument(writer);
-		pdf.setDefaultPageSize(new PageSize(975, 650));
+		pdf.setDefaultPageSize(new PageSize(html_max_width, html_max_heght));
 		Document document = HtmlConverter.convertToDocument(new FileInputStream(html), pdf, props);
 		// 将所有内容在一个页面显示
 		EndPosition endPosition = new EndPosition();
@@ -44,19 +66,19 @@ public class HtmlToPdf {
 		document.getRenderer().close();
 		PdfPage page = pdf.getPage(1);
 		float y = endPosition.getY() - 36;
-		page.setMediaBox(new Rectangle(0, y, 975, 650 - y));
+		page.setMediaBox(new Rectangle(0, y, html_max_width, html_max_heght - y));
 		document.close();
 		pdf.close();
 	}
 
-	public static void main(String[] args) {
+/*	public static void main(String[] args) {
 		try {
 			HtmlToPdf html = new HtmlToPdf();
 			html.tomPdf(SRC, DEST);
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-	}
+	}*/
 
 	class EndPosition implements ILineDrawer {