feat(FILE模块): 优化了存放位置，按照文件夹分开放置

dev-file/src/main/java/com/tykj/dev/device/file/service/Impl/UseReportFIleServiceImpl.java

@@ -76,7 +76,7 @@ public class UseReportFIleServiceImpl implements UseReportFIleService {
         params.put("TitleTimeStart",wrodParameter.getTitleTimeStart());
         params.put("TitleUnitName",wrodParameter.getTitleUnitName());
         String fileName = wrodParameter.getTitleTimeStart()+"至"+wrodParameter.getTitleTimeEnd()+"使用报告" + ".doc";
-        String templatePath = ResourceUtils.getURL(  "classpath:").getPath()+docModel;
+        String templatePath = ResourceUtils.getURL(  "classpath:").getPath()+"docTemplate/"+docModel;
         url=url+"report/";
         String uuidName=UUID.randomUUID().toString().replace("-", "") + ".doc";
         String fileUrl= WordUtil.createWord(templatePath,url,uuidName,params);

dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java

@@ -63,7 +63,7 @@ public class JavaToPdfHtmlFreeMarker {
         freemarkerCfg =new Configuration();
         //freemarker的模板目录
         try {
-            freemarkerCfg.setDirectoryForTemplateLoading(new File(ResourceUtils.getURL("classpath:").getPath()));
+            freemarkerCfg.setDirectoryForTemplateLoading(new File(ResourceUtils.getURL("classpath:").getPath()+"htmlTemplate/"));
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -118,8 +118,8 @@ public class JavaToPdfHtmlFreeMarker {
                     renderer.setDocument(htmlFile);
                     // 解决中文不显示问题
                     ITextFontResolver fontResolver = renderer.getFontResolver();
-                    fontResolver.addFont(ResourceUtils.getURL("classpath:").getPath()+"simhei.ttf", BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);
-                    fontResolver.addFont(ResourceUtils.getURL("classpath:").getPath()+"simhei2.ttf", BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);
+                    fontResolver.addFont(ResourceUtils.getURL("classpath:").getPath()+"font/simhei.ttf", BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);
+                    fontResolver.addFont(ResourceUtils.getURL("classpath:").getPath()+"font/simhei2.ttf", BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);
                     renderer.layout();
                     renderer.createPDF(os);
                     PdfReader pdfReader = new PdfReader(os.toByteArray());
@@ -162,8 +162,8 @@ public class JavaToPdfHtmlFreeMarker {
                     renderer.setDocument(htmlFile);
                     // 解决中文不显示问题
                     ITextFontResolver fontResolver = renderer.getFontResolver();
-                    fontResolver.addFont(ResourceUtils.getURL("classpath:").getPath()+"simhei.ttf", BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);
-                    fontResolver.addFont(ResourceUtils.getURL("classpath:").getPath()+"simhei2.ttf", BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);
+                    fontResolver.addFont(ResourceUtils.getURL("classpath:").getPath()+"font/simhei.ttf", BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);
+                    fontResolver.addFont(ResourceUtils.getURL("classpath:").getPath()+"font/simhei2.ttf", BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);
                     renderer.layout();
                     renderer.createPDF(os);
                     PdfReader pdfReader = new PdfReader(os.toByteArray());

dev-union/src/main/resources/application-prod.properties

 spring.datasource.driver-class-name=com.oscar.Driver
-spring.datasource.url=jdbc:oscar://10.153.4.10:2003/OSRDB
-#spring.datasource.url=jdbc:oscar://192.168.0.80:2003/OSRDB
+#spring.datasource.url=jdbc:oscar://10.153.4.10:2003/OSRDB
+spring.datasource.url=jdbc:oscar://192.168.0.80:2003/OSRDB?useSSL=false&rewriteBatchedStatements=TRUE
 spring.datasource.username=SYSDBA
 spring.datasource.password=szoscar55
 spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
-file.path=/opt/zb/
-preview.path=http://10.153.4.11:8088/equip/file/
+#file.path=/opt/zb/
+#preview.path=http://10.153.4.11:8088/equip/file/
 #preview.path=http://192.168.0.80:8088/equip/file/
\ No newline at end of file

dev-union/src/main/resources/repair.html → dev-union/src/main/resources/htmlTemplate/repair.html

@@ -469,7 +469,7 @@
                                         <th width="100px">应用领域</th>
                                         <th width="72px">数量</th>
                                         <th width="120px">装备序列号</th>
-                                        <th>维修原因</th>
+                                        <th >维修原因</th>
                                     </tr>
                                     <#list documentDevices as dev>
                                         <tr class="altrowstableTr">
@@ -521,7 +521,6 @@
                                             <#elseif dev.oneCount == 14>
                                             <td class="td14">${dev.deviceSerialNumber!}</td>
                                         </#if>
-
                                             <td>${dev.remark!}</td>
                                         </tr>
                                     </#list>
@@ -536,6 +535,7 @@
                                         <th width="72px"></th>
                                         <th width="420px"></th>
                                         <th></th>
+                                        <th></th>
                                     </tr>
                                         <tr class="altrowstableTr">
                                             <td></td>