xiongzhu пре 4 година
родитељ
комит
ce0a268cd1

+ 385 - 3
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionDocToPDFWorkOrWorkCompleted.java

@@ -253,7 +253,7 @@ class ActionDocToPDFWorkOrWorkCompleted extends BaseAction {
         }
     }
 
-    private byte[] local(Wi wi) throws Exception {
+    public byte[] local(Wi wi) throws Exception {
         try (POIFSFileSystem fs = new POIFSFileSystem();
              InputStream is = new ByteArrayInputStream(wi.getContent().getBytes(DefaultCharset.name_iso_utf_8));
              ByteArrayOutputStream out = new ByteArrayOutputStream()) {
@@ -273,13 +273,13 @@ class ActionDocToPDFWorkOrWorkCompleted extends BaseAction {
             String password = "3edc#EDC";
 
             KeyStore keystore = KeyStore.getInstance("PKCS12");
-            keystore.load(getClass().getResourceAsStream("myKeystore.p12"), password.toCharArray());
+            keystore.load(getClass().getResourceAsStream("/myKeystore.p12"), password.toCharArray());
 
 
             CreateVisibleSignature2 signing = new CreateVisibleSignature2(keystore, password.toCharArray());
 
             File imgFile = TempFile.createTempFile("sig", ".png");
-            FileUtils.copyInputStreamToFile(getClass().getResourceAsStream("sig.png"), imgFile);
+            FileUtils.copyInputStreamToFile(getClass().getResourceAsStream("/sig.png"), imgFile);
 
             signing.setImageFile(imgFile);
             signing.setExternalSigning(false);
@@ -297,6 +297,388 @@ class ActionDocToPDFWorkOrWorkCompleted extends BaseAction {
         }
     }
 
+    public static void main(String[] args) throws Exception {
+        Wi wi = new Wi();
+        wi.setContent("<html xmlns:v=\"urn:schemas-microsoft-com:vml\"><head><meta charset=\"UTF-8\" /></head><body><style>\n" +
+                "    @page WordSection1\n" +
+                "    {size:595.3pt 841.9pt;\n" +
+                "        margin:104.9pt 73.7pt 99.25pt 79.4pt;\n" +
+                "        layout-grid:15.6pt;\n" +
+                "        line-height:normal;\n" +
+                "        font-size:16.0pt;\n" +
+                "        font-family:仿宋;\n" +
+                "        letter-spacing:-0.4pt;\n" +
+                "        mso-header-margin:42.55pt;\n" +
+                "        mso-footer-margin:70.9pt;\n" +
+                "        mso-paper-source:0;\n" +
+                "    }\n" +
+                "    div.WordSection1\n" +
+                "    {page:WordSection1;\n" +
+                "        font-size:16.0pt;\n" +
+                "        font-family:仿宋;\n" +
+                "        line-height:normal;\n" +
+                "        letter-spacing:-0.4pt;\n" +
+                "    }\n" +
+                "    p.MsoNormal, li.MsoNormal, div.MsoNormal\n" +
+                "    {mso-style-unhide:no;\n" +
+                "        mso-style-qformat:yes;\n" +
+                "        mso-style-parent:\"\";\n" +
+                "        margin:0cm;\n" +
+                "        margin-bottom:.0001pt;\n" +
+                "        text-align:left;\n" +
+                "        text-justify:inter-ideograph;\n" +
+                "        mso-pagination:none;\n" +
+                "        font-size:16.0pt;\n" +
+                "        mso-bidi-font-size:11.0pt;\n" +
+                "        font-family:仿宋;\n" +
+                "        line-height:28.0pt;\n" +
+                "        mso-line-height-rule:exactly;\n" +
+                "        mso-ascii-font-family:仿宋;\n" +
+                "        mso-ascii-theme-font:minor-latin;\n" +
+                "        mso-fareast-font-family:仿宋;\n" +
+                "        mso-fareast-theme-font:minor-fareast;\n" +
+                "        mso-hansi-font-family:仿宋;\n" +
+                "        mso-hansi-theme-font:minor-latin;\n" +
+                "        mso-bidi-font-family:\"Times New Roman\";\n" +
+                "        mso-bidi-theme-font:minor-bidi;\n" +
+                "        mso-font-kerning:1.0pt;}\n" +
+                "    p.MsoFooter, li.MsoFooter, div.MsoFooter\n" +
+                "    {mso-style-unhide:no;\n" +
+                "        margin:0cm;\n" +
+                "        margin-bottom:.0001pt;\n" +
+                "        mso-pagination:none;\n" +
+                "        tab-stops:center 207.65pt right 415.3pt;\n" +
+                "        layout-grid-mode:char;\n" +
+                "        font-size:9.0pt;\n" +
+                "        font-family:\"Times New Roman\",serif;\n" +
+                "        mso-fareast-font-family:宋体;\n" +
+                "        mso-font-kerning:1.0pt;}\n" +
+                "    .MsoRedHeader\n" +
+                "    {mso-style-unhide:no;\n" +
+                "        mso-style-qformat:yes;\n" +
+                "        mso-style-parent:\"\";\n" +
+                "        margin:0cm;\n" +
+                "        margin-bottom:.0001pt;\n" +
+                "        text-align:justify;\n" +
+                "        text-justify:inter-ideograph;\n" +
+                "        mso-pagination:none;\n" +
+                "        font-family:宋体;\n" +
+                "        mso-ascii-font-family:宋体;\n" +
+                "        mso-ascii-theme-font:minor-latin;\n" +
+                "        mso-fareast-font-family:宋体;\n" +
+                "        mso-fareast-theme-font:minor-fareast;\n" +
+                "        mso-hansi-font-family:宋体;\n" +
+                "        mso-hansi-theme-font:minor-latin;\n" +
+                "        mso-bidi-font-family:\"Times New Roman\";\n" +
+                "        mso-bidi-theme-font:minor-bidi;\n" +
+                "        mso-font-kerning:1.0pt;}\n" +
+                "    span.GramE\n" +
+                "    {mso-style-name:\"\";\n" +
+                "        mso-gram-e:yes;}\n" +
+                "    td.line_top_thin_bottom_thin\n" +
+                "    {\n" +
+                "        mso-border-bottom-alt: solid windowtext .75pt;\n" +
+                "        border-bottom:solid windowtext .75pt;\n" +
+                "        mso-border-top-alt: solid windowtext .75pt;\n" +
+                "        border-top:solid windowtext .75pt;\n" +
+                "    }\n" +
+                "    td.line_top_thin_bottom_thick\n" +
+                "    {\n" +
+                "        mso-border-top-alt: solid windowtext .75pt;\n" +
+                "        border-top:solid windowtext .75pt;\n" +
+                "        mso-border-bottom-alt: solid windowtext 1pt;\n" +
+                "        border-bottom:solid windowtext 1.5pt;\n" +
+                "    }\n" +
+                "    td.line_top_thick_bottom_thin\n" +
+                "    {\n" +
+                "        mso-border-top-alt: solid windowtext 1pt;\n" +
+                "        border-top:solid windowtext 1.5pt;\n" +
+                "        mso-border-bottom-alt: solid windowtext 0.75pt;\n" +
+                "        border-bottom:solid windowtext 0.75pt;\n" +
+                "    }\n" +
+                "    td.line_top_thick_bottom_thick\n" +
+                "    {\n" +
+                "        mso-border-bottom-alt: solid windowtext 1pt;\n" +
+                "        border-bottom:solid windowtext 1.5pt;\n" +
+                "        mso-border-top-alt: solid windowtext 1pt;\n" +
+                "        border-top:solid windowtext 1.5pt;\n" +
+                "    }\n" +
+                "</style>\n" +
+                "<div class=\"WordSection1\" style=\"layout-grid:15.6pt; font-size:16.0pt;font-family:仿宋\">\n" +
+                "    <!--  份数、密级、紧急度  -->\n" +
+                "    <div class=\"doc_block doc_layout_copiesSecretPriority\">\n" +
+                "        <p class=\"MsoNormal\">\n" +
+                "            \n" +
+                "        </p>\n" +
+                "        <p class=\"MsoNormal\">\n" +
+                "            <span class=\"doc_layout_secret\" style=\"font-size:16.0pt;font-family:黑体\">一般商密</span>\n" +
+                "        </p>\n" +
+                "        <p class=\"MsoNormal\">\n" +
+                "            <span class=\"doc_layout_priority\" style=\"font-size:16.0pt;font-family:黑体\">&nbsp;</span>\n" +
+                "        </p>\n" +
+                "        <p class=\"MsoNormal doc_layout_copiesSecretPriority_blank\"><span style=\"font-size:16.0pt\">&nbsp;</span></p>\n" +
+                "    </div>\n" +
+                "\n" +
+                "    <!--  红头  -->\n" +
+                "    <div class=\"doc_block\">\n" +
+                "        <p class=\"MsoRedHeader\" align=\"center\" style=\"text-align:center;mso-line-height-rule:exactly;\"><b>\n" +
+                "            <span class=\"doc_layout_redHeader\" style=\"font-size:42.0pt;font-family:宋体;color:red;letter-spacing:normal\">军民融合办公室文件</span>\n" +
+                "        </b></p>\n" +
+                "    </div>\n" +
+                "\n" +
+                "        <div class=\"doc_block doc_layout_fileno_area\">\n" +
+                "            <p class=\"MsoNormal\" align=\"center\" style=\"text-align:center\"><span style=\"font-size:16.0pt;font-family:仿宋\">&nbsp;</span></p>\n" +
+                "            <p class=\"MsoNormal\" align=\"center\" style=\"text-align:center\"><span class=\"doc_layout_fileno\" style=\"mso-bidi-font-size:16.0pt;font-family:&quot;Times New Roman&quot;,仿宋;mso-fareast-font-family:仿宋;mso-ascii-font-family:&quot;Times New Roman&quot;\">[文号]</span></p>\n" +
+                "        </div>\n" +
+                "\n" +
+                "    \n" +
+                "\n" +
+                "    <p class=\"doc_block MsoNormal\" align=\"left\" style=\"line-height:8.0pt\"></p><hr class=\"doc_layout_redline\" style=\"height: 1.5pt;line-height:8.0pt; backgroud-color: red;\" color=\"red\"><p></p>\n" +
+                "\n" +
+                "    <div class=\"doc_block\">\n" +
+                "        <p class=\"MsoNormal\" style=\"font-size:16.0pt;font-family:仿宋;line-height: 22pt\"><span>&nbsp;</span></p>\n" +
+                "        <p class=\"MsoNormal\" align=\"center\" style=\"text-align:center\"><span class=\"doc_layout_subject\" style=\"font-size:22.0pt; font-weight:bold;font-family:宋体,serif;letter-spacing:normal\">gsdfhsd</span></p>\n" +
+                "        <p class=\"MsoNormal\" style=\"font-size:12.0pt;font-family:仿宋;line-height: 22pt\"><span>&nbsp;</span></p>\n" +
+                "    </div>\n" +
+                "\n" +
+                "    <p class=\"MsoNormal doc_block\" align=\"left\" style=\"text-align:left\"><span class=\"doc_layout_mainSend\" style=\"font-size:16.0pt;font-family:仿宋;letter-spacing:-0.4pt\">:</span></p>\n" +
+                "\n" +
+                "    <div class=\"MsoNormal doc_block doc_layout_filetext css384e70c2-d60c-4872-8edd-4da97d7f1920documenteditor\" style=\"font-family:仿宋;text-align:justify;font-size: 16pt;letter-spacing:-0.4pt\"><div>\n" +
+                "<div>  央视新闻客户端2021年4月12日讯 我国目前正在应接尽接、按梯次,对重点地区、重点人群、重点城市加快推进新冠疫苗接种。截至4月10日24时,全国累计报告接种新冠疫苗16447.1万剂次。针对新冠疫情防控和疫苗接种有关情况,《面对面》专访了中国疾控中心免疫规划首席专家王华庆。</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  人类疫苗接种史上首次国家级最大规模日报制度</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  从3月24日起,中国启动新冠疫苗接种数据的日报制度,国家卫健委每日在官网公布疫苗接种总数,这也是人类疫苗接种史上首次启动国家级最大规模的日报制度。</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  记者:按照我们疫苗接种的设置和规划,目前的接种情况处于一个怎样的时间节点?</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  王华庆:我们国家要建立免疫屏障,可能需要10亿人以上接种新冠疫苗,接种率越高,免疫屏障形成就越牢固,接下来我们还有一段路要走。</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  新冠疫苗的安全性究竟如何?</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  虽然在刚刚过去的一周,国内新冠疫苗单日接种量从三四百万快速增长到700万,但和一些接种率达到百分之四十甚至百分之六十的国家相比,仍然属于较低水平。</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  记者:新冠疫苗从研发到生产再到应用是在非常快的速度下完成的,我们知道常规的疫苗大概需要五到十年研发才能到应用层次,所以对于新冠疫苗的安全性很多人会担心?</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  王华庆:新冠疫苗的研发经历了临床前、临床一二三期然后才上市的,上市之后还要开展研究,这对疫苗的安全性都是保证。</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  记者:这种超越正常规律研发出来的疫苗,安全性能达到百分之百吗?</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  王华庆:任何一个疫苗都有它的风险,我们现在打这个疫苗有不良反应或者严重过敏性反应的,是百万分之一的数据,但相比新冠肺炎的病亡率2%的数据,我们就可以看出新冠给我们带来的危害是非常大的,疫苗我们还可以有一些措施去把风险降到最低。</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  接种新冠疫苗需不需要再等等?</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  在国内还有人对疫苗持观望态度,纠结有没有必要打、质疑能不能打的时候,全球至少有70个国家和地区已经批准使用或同意购买中国疫苗,有不少国外领导人早早就接种了中国疫苗。但由于国内疫情控制有力,一些人仍在观望,并期望有更好的疫苗出现。</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  记者:大家会觉得既然将来可能会做得更好,目前的形势也没有那么迫切,那我能不能往后拖一拖再打这个疫苗,这样可能对我个人会更好?</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  王华庆:大家都把这个接种疫苗往后拖,那我们的免疫屏障永远建立不起来,我们想摘掉口罩的愿望可能就不能成为现实,如果大家接种得快可能这个屏障就会早一天到来,我们就可以早点恢复到过去正常的生活。</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  记者:但很多人也会说为什么要我冲在前面?</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  王华庆:现在还有一个问题,就是大家也非常关注病毒变异,如果疾病一直蔓延下去,病毒变异的速度就会变快,对应的,这个疾病的传染性也会增加,严重的情况疫苗可能就会失效,所以阻止病毒变异速度加快最好的办法,就是接种疫苗。接种疫苗之后,我们有了免疫力,就不能作为传染源了,病毒就传播不下去了。</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  新冠疫苗能否应对病毒变异?</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  新冠疫情被世界卫生组织宣称“有史以来最严重的全球公共卫生紧急事件”,而造成此次疫情的新冠病毒,被专家称为是人类所知病毒中最狡猾的病毒,传染性强,病死率高,而且在不停地发生变异。</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  记者:您刚才也谈到病毒存在变异的可能,那我们现在接种了疫苗能否有效地防控,形成免疫屏障吗?</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  王华庆:虽然我们看到了病毒变异,但目前看接种疫苗还是有用的。针对病毒变异的情况,目前各国科学家也在想办法争取把变异的情况监测出来,针对其中可能会影响到疫苗作用的,去寻找对应的解决办法。</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  接种疫苗后为何还会被确诊?</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  3月18日,西安市一名医生在早已完成新冠疫苗两针接种的情况下,被确诊为新冠肺炎病例。对此,王华庆介绍,疫苗的最好作用是预防感染,这次新冠疫苗的作用既有预防感染、也有预防发病的作用,而预防重症的效果更高一些。</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  王华庆:目前上市的这几种疫苗保护率都不是百分之百,会有因个体的原因或者疫苗特性的原因失败的情况,它不是普遍性。这种情况我们可以根据目前的保护效率去解释,根据目前三期临床实验的结果,包括最近国外发表的上市后的保护效果来看,疫苗其实对大多数人产生了保护作用。</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  孕妇能否接种新冠疫苗?</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  随着新冠疫苗接种的深入,原来的一些限制条件也随之发生变化。就在上个月,上海和北京先后组织为有接种需求且身体基础状况较好的60岁及以上老年人接种新冠疫苗。而在疫苗接种初期,60岁以上的老人并不被建议接种。</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  记者:孕妇是很特殊的群体,现在孕妇能接种新冠疫苗吗?</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  王华庆:现在我们给出的建议是孕妇(暂)不接种。</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  记者:如果接种了新冠疫苗之后意外怀孕了,怎么办?</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  王华庆:这种情况我们在指南当中也给了相应的建议,接种疫苗之后怀孕了,不需要采取特殊的措施,后续做好孕期的保健还有随访工作,跟其他人都是一样的措施就行了。</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  五种新冠疫苗究竟该打哪一种?</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  在新冠疫苗的研发方面,中国一直走在世界第一方阵。目前,我国已有五个生产企业的新冠病毒疫苗批准附条件上市或紧急使用,且全部对国民免费接种。应该选择哪种疫苗为自己接种,也是不少人正在纠结的问题。</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "<div>\n" +
+                "<div>  王华庆:新冠疫苗之所以能够批准上市批准使用,其实达到了最基本的要求,在这种情况下,就由国家确定哪些地方供应什么疫苗,统一调配。我们希望尽快接种,尽快建立免疫屏障,尽量不去考虑个体差异,因为如果差异大的话,肯定有办法。</div>\n" +
+                "</div>\n" +
+                "</div>\n" +
+                "\n" +
+                "    <p class=\"MsoNormal doc_block\" style=\"font-size:16.0pt;font-family:仿宋\"><span>&nbsp;</span></p>\n" +
+                "\n" +
+                "    \n" +
+                "\n" +
+                "    <div class=\"doc_block\">\n" +
+                "        <p class=\"MsoNormal\" style=\"font-size:16.0pt;font-family:仿宋\"><span>&nbsp;</span></p>\n" +
+                "        <p class=\"MsoNormal\" style=\"font-size:16.0pt;font-family:仿宋\"><span>&nbsp;</span></p>\n" +
+                "        <p class=\"MsoNormal\" style=\"font-size:16.0pt;font-family:仿宋\"><span>&nbsp;</span></p>\n" +
+                "\n" +
+                "        <table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%; border-collapse:collapse;border:none;mso-padding-alt:0cm 0cm 0cm 0cm\">\n" +
+                "            <tbody><tr style=\"mso-yfti-irow:0;mso-yfti-firstrow:yes\">\n" +
+                "                <td width=\"100%\" valign=\"top\" style=\"width:100%;padding:0cm 0cm 0cm 0cm\">\n" +
+                "                    <table class=\"doc_layout_issuance\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\" align=\"right\" width=\"auto\" style=\"width:auto;border-collapse:collapse;border:none;mso-table-overlap:never;mso-table-anchor-vertical:paragraph; mso-table-anchor-horizontal:margin;mso-table-left:right;mso-table-top:.05pt; mso-padding-alt:0cm 0cm 0cm 0cm\">\n" +
+                "                        <tbody><tr style=\"mso-yfti-irow:0;mso-yfti-firstrow:yes\">\n" +
+                "                            <td style=\"padding:0cm 0cm 0cm 0cm\">\n" +
+                "                                <p class=\"MsoNormal\" align=\"center\" style=\"text-align:center;mso-element:frame; mso-element-wrap:around;mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal: margin;mso-element-left:right;mso-element-top:.05pt;mso-height-rule:exactly\">\n" +
+                "                                    <span class=\"doc_layout_issuanceUnit\" style=\"mso-bidi-font-size:16.0pt; line-height:28.0pt; font-size: 16pt;font-family:仿宋;letter-spacing:-0.4pt;\">军民融合办公室</span>\n" +
+                "                                </p>\n" +
+                "                            </td>\n" +
+                "                            <td width=\"47\" valign=\"top\" style=\"width: 32pt; border-left: none; padding: 0cm;\">\n" +
+                "                                <p class=\"MsoNormal\" style=\"mso-element:frame;mso-element-wrap:around; mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal:margin; mso-element-left:right;mso-element-top:.05pt;mso-height-rule:exactly\">\n" +
+                "                                    <span style=\"mso-bidi-font-size:16.0pt;font-family:仿宋;letter-spacing:-.4pt\"> </span>\n" +
+                "                                </p>\n" +
+                "                            </td>\n" +
+                "                        </tr>\n" +
+                "                    </tbody></table>\n" +
+                "                </td>\n" +
+                "            </tr>\n" +
+                "            <tr style=\"mso-yfti-irow:0;mso-yfti-firstrow:yes\">\n" +
+                "                <td width=\"100%\" valign=\"top\" style=\"width:100%;padding:0cm 0cm 0cm 0cm\">\n" +
+                "                    <table class=\"doc_layout_issuance\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\" align=\"right\" width=\"auto\" style=\"width: 189px; border-collapse: collapse; border: none;\">\n" +
+                "                        <tbody><tr style=\"mso-yfti-irow:1;mso-yfti-lastrow:yes\">\n" +
+                "                            <td style=\"border-top:none;padding:0cm 0cm 0cm 0cm\">\n" +
+                "                                <p class=\"MsoNormal\" align=\"center\" style=\"text-align: center;\">\n" +
+                "                                    <span class=\"doc_layout_issuanceDate\" style=\"mso-bidi-font-size:16.0pt; line-height:28.0pt; font-size: 16pt;  font-family:&quot;Times New Roman&quot;,仿宋;mso-fareast-font-family:仿宋;mso-ascii-font-family:&quot;Times New Roman&quot;;letter-spacing:-0.4pt;\">[成文日期]</span>\n" +
+                "                                </p>\n" +
+                "                            </td>\n" +
+                "                            <td width=\"47\" valign=\"top\" style=\"width:32pt;padding:0cm 0cm 0cm 0cm\">\n" +
+                "                                <p class=\"MsoNormal\" style=\"mso-element:frame;mso-element-wrap: around;mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal: margin;mso-element-left:right;mso-element-top:.05pt;mso-height-rule:exactly\">\n" +
+                "                                    <span style=\"mso-bidi-font-size:16.0pt;font-family:仿宋;letter-spacing:-0.4pt\"> </span>\n" +
+                "                                </p>\n" +
+                "                            </td>\n" +
+                "                        </tr>\n" +
+                "                    </tbody></table>\n" +
+                "                </td>\n" +
+                "            </tr>\n" +
+                "            <tr style=\"mso-yfti-irow:1;mso-yfti-lastrow:yes\">\n" +
+                "                <td width=\"100%\" valign=\"top\" style=\"width:100%;padding:0cm 0cm 0cm 0cm\">\n" +
+                "                    <p class=\"MsoNormal\">\n" +
+                "                        \n" +
+                "                    </p>\n" +
+                "                </td>\n" +
+                "            </tr>\n" +
+                "        </tbody></table>\n" +
+                "    </div>\n" +
+                "\n" +
+                "    <div class=\"doc_block doc_layout_editionArea\">\n" +
+                "        <p class=\"MsoNormal\" style=\"font-size:16.0pt;font-family:仿宋\"><span>&nbsp;</span></p>\n" +
+                "        <table class=\"doc_block doc_layout_edition\" data-compute-style=\"y\" border=\"1\" cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%; line-height:normal;border-collapse:collapse;border:none;mso-yfti-tbllook:2184; mso-padding-alt:0cm 0cm 0cm 0cm;mso-table-anchor-vertical:margin; mso-table-anchor-horizontal:column;mso-table-left:left;mso-table-top:bottom;\">\n" +
+                "            <tbody><tr style=\"page-break-inside:avoid\">\n" +
+                "                <td valign=\"top\" class=\"line_top_thick_bottom_thin doc_layout_edition_copyto\" style=\"width: 38pt; border-left: none; border-right: none; padding: 5.4pt 0cm 5.4pt 14pt; max-width: 42pt; min-width: 42pt;\">\n" +
+                "                    <p class=\"MsoNormal\" align=\"left\" style=\"font-size:14.0pt;font-family:仿宋; text-align:left;line-height: normal\"><span class=\"doc_layout_edition_copyto_title\" style=\"font-size:14.0pt;font-family:仿宋;letter-spacing:-0.4pt; padding:0cm\">抄送</span></p>\n" +
+                "                </td>\n" +
+                "                <td class=\"line_top_thick_bottom_thin\" valign=\"top\" colspan=\"2\" style=\"width:360pt;border-left:none;border-right:none;padding:5.4pt 14pt 5.4pt 0cm\">\n" +
+                "                    <p class=\"MsoNormal\" align=\"left\" style=\"font-size:14.0pt;font-family:仿宋; text-align:left;line-height: normal\"><span class=\"doc_layout_edition_copyto_content\" style=\"font-size:14.0pt;font-family:仿宋;letter-spacing:-0.4pt; padding:0cm\"> </span></p>\n" +
+                "                </td>\n" +
+                "            </tr>\n" +
+                "            <tr style=\"page-break-inside:avoid\">\n" +
+                "                <td class=\"line_top_thin_bottom_thick\" colspan=\"3\" style=\"border-left:none;border-right:none;padding:0cm\">\n" +
+                "\n" +
+                "                    <table class=\"MsoTableGrid\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"width:100.0%;border-collapse:collapse;border:none;\">\n" +
+                "                        <tbody><tr style=\"mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes;page-break-inside:avoid\">\n" +
+                "                            <td class=\"doc_layout_edition_issuance\" valign=\"top\" style=\"border:none; padding: 0pt 0pt 4pt 14pt\">\n" +
+                "                                <p class=\"MsoNormal\" align=\"left\" style=\"line-height:24pt;text-align:left\"><span class=\"doc_layout_edition_issuance_unit\" style=\"font-size:14.0pt;font-family:仿宋;letter-spacing:-0.4pt\">军民融合办公室</span></p>\n" +
+                "                            </td>\n" +
+                "                            <td valign=\"top\" style=\"border:none; padding: 0pt 14pt 4pt 0pt\">\n" +
+                "                                <p class=\"MsoNormal\" align=\"right\" style=\"line-height:24pt;text-align:right\"><span class=\"doc_layout_edition_issuance_date\" style=\"font-size:14.0pt;font-family:&quot;Times New Roman&quot;,仿宋;mso-fareast-font-family:仿宋;mso-ascii-font-family:&quot;Times New Roman&quot;; letter-spacing:0.4pt\">[印发日期]</span></p>\n" +
+                "                            </td>\n" +
+                "                        </tr>\n" +
+                "                    </tbody></table>\n" +
+                "\n" +
+                "<!--                    <table border=0 cellspacing=0 cellpadding=0 style='width:100%; border: none'>-->\n" +
+                "<!--                        <tr>-->\n" +
+                "<!--                            <td class=\"doc_layout_edition_issuance\" width=315 colspan=2 valign=middle style='width:315pt;border:none; padding: 0pt 0pt 0pt 14pt'>-->\n" +
+                "<!--                                <p class=MsoNormal align=left style='font-size:14.0pt;font-family:仿宋; text-align:left;line-height: normal'><span class=\"doc_layout_edition_issuance_unit\" style='font-size:14.0pt;font-family:仿宋;letter-spacing:-0.4pt'>[印发单位]</span></p>-->\n" +
+                "<!--                            </td>-->\n" +
+                "<!--                            <td width=120 valign=middle style='width:125pt;border:none; padding: 0pt 14pt 0pt 0pt'>-->\n" +
+                "<!--                                <p class=MsoNormal align=right style='font-size:14.0pt;font-family:仿宋; text-align:right;line-height: normal'><span class=\"doc_layout_edition_issuance_date\" style='font-size:14.0pt;font-family:\"Times New Roman\",仿宋;mso-fareast-font-family:仿宋;mso-ascii-font-family:\"Times New Roman\"; letter-spacing:0.4pt'>[印发时间]</span></p>-->\n" +
+                "<!--                            </td>-->\n" +
+                "<!--                        </tr>-->\n" +
+                "<!--                    </table>-->\n" +
+                "                </td>\n" +
+                "\n" +
+                "            </tr>\n" +
+                "        </tbody></table>\n" +
+                "    </div>\n" +
+                "</div>\n" +
+                "</body></html>");
+        ActionDocToPDFWorkOrWorkCompleted act = new ActionDocToPDFWorkOrWorkCompleted();
+        FileUtils.writeByteArrayToFile(new File("/Users/drew/Desktop/1.pdf"), act.local(wi));
+
+    }
+
     public static class Wo extends WoId {
     }
 

+ 5 - 5
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/signature/CreateVisibleSignature2.java

@@ -444,11 +444,11 @@ public class CreateVisibleSignature2 extends CreateSignatureBase
         String date = signature.getSignDate().getTime().toString();
         String reason = signature.getReason();
 
-        cs.showText("Signer: " + name);
-        cs.newLine();
-        cs.showText(date);
-        cs.newLine();
-        cs.showText("Reason: " + reason);
+//        cs.showText("Signer: " + name);
+//        cs.newLine();
+//        cs.showText(date);
+//        cs.newLine();
+//        cs.showText("Reason: " + reason);
 
         cs.endText();