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

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/WordHtml.java

@@ -192,30 +192,5 @@ public class WordHtml implements AbstractHtml {
             }
         }
     }
-
-
-    public static void xml2Ttml(String docPath, String xsltPath, String hrmlPath) {
-        try (
-                //创建XML的文件输入流
-                FileInputStream fis = new FileInputStream(org.apache.commons.io.FilenameUtils.normalize(docPath));
-                //创建XSL文件的输入流
-                FileInputStream fis1 = new FileInputStream(FilenameUtils.normalize(xsltPath));
-                PrintStream stm = new PrintStream(hrmlPath);
-        ) {
-            Source source = new StreamSource(fis);
-            Source template = new StreamSource(fis1);
-            //讲转换后的结果输出到 stm 中即 F:\123.html
-            Result result = new StreamResult(stm);
-            //根据XSL文件创建准个转换对象
-            TransformerFactory transformerFactory = TransformerFactory.newInstance();
-            transformerFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
-            transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
-            Transformer transformer = transformerFactory.newTransformer(template);
-            //处理xml进行交换
-            transformer.transform(source, result);
-        } catch (TransformerException | IOException e) {
-            e.printStackTrace();
-        }
-    }
 }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/util/WordHtml.java

@@ -191,30 +191,5 @@ public class WordHtml implements AbstractHtml {
     }
   }
 
-
-  public static void xml2Ttml(String docPath, String xsltPath, String hrmlPath) {
-    try (
-            //创建XML的文件输入流
-            FileInputStream fis = new FileInputStream(FilenameUtils.normalize(docPath));
-            //创建XSL文件的输入流
-            FileInputStream fis1 = new FileInputStream(FilenameUtils.normalize(xsltPath));
-            PrintStream stm = new PrintStream(hrmlPath);
-    ) {
-      Source source = new StreamSource(fis);
-      Source template = new StreamSource(fis1);
-      //讲转换后的结果输出到 stm 中即 F:\123.html
-      Result result = new StreamResult(stm);
-      //根据XSL文件创建准个转换对象
-      TransformerFactory transformerFactory = TransformerFactory.newInstance();
-      transformerFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
-      transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
-      Transformer transformer = transformerFactory.newTransformer(template);
-      //处理xml进行交换
-      transformer.transform(source, result);
-    } catch (TransformerException | IOException e) {
-      e.printStackTrace();
-    }
-  }
-
 }