工作交接修改提交以及自查单位

dev-file/src/main/java/com/tykj/dev/device/file/Controller/FileController.java

@@ -76,7 +76,7 @@ public class FileController {
      */
     @ApiOperation(value = "生成维修单据")
     @PostMapping("/printRepair")
-    public ResponseEntity printRepair(@RequestBody Documents documents) throws IOException, DocumentException {
+    public ResponseEntity printRepair(@RequestBody Documents documents) {
         String[] content = JavaToPdfHtmlFreeMarker.freeMarkerRenderRepair(documents,url+"htmlModel/");
         log.info("[file] 调用了生成出入单据对接口 出入库单据");
         return ResponseEntity.ok(JavaToPdfHtmlFreeMarker.createPdf(content,url,preview,"documents/"));
@@ -213,7 +213,7 @@ public class FileController {
      */
     @ApiOperation(value = "生成单据1")
     @GetMapping("/printDocuments1")
-    public ResponseEntity printDocuments(HttpServletResponse response,HttpServletRequest request) throws IOException, DocumentException {
+    public ResponseEntity printDocuments(HttpServletResponse response,HttpServletRequest request){
         int interval = request.getSession().getMaxInactiveInterval();
         System.out.println("-------"+interval);
         Documents documents=new Documents();

dev-file/src/main/java/com/tykj/dev/device/file/entity/DocumentDevice.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @author zjm
@@ -84,4 +85,25 @@ public class DocumentDevice {
         this.setOneCount((remainder > 0) ? deviceSerialNumber.length()/56 + 1 :  deviceSerialNumber.length()/56);
         return this;
     }
+
+    public DocumentDevice toChangeWord(){
+        remark=changeWord(remark);
+        return this;
+    }
+
+    public String changeWord(String keyword) {
+        String returnVal = keyword;
+        if (StringUtils.isNotBlank(keyword)) {
+            if (keyword.contains("&")) {
+                returnVal = keyword.replace("&", "&");
+            }
+            if (keyword.contains("<")) {
+                returnVal = keyword.replace("<", "&lt;");
+            }
+            if (keyword.contains(">")) {
+                returnVal = keyword.replace(">", "&gt;");
+            }
+        }
+        return returnVal;
+    }
 }

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

@@ -266,6 +266,7 @@ public class JavaToPdfHtmlFreeMarker {
             return strings;
         } catch (Exception e) {
             log.error("[freeMarkerRender] 方法找不到地址：{}",htmlPath);
+
         } finally {
             try {
                 out.close();
@@ -632,7 +633,7 @@ public class JavaToPdfHtmlFreeMarker {
 //                    list1.add(documentDevice);
 //                }
 //        );
-        data.put("documentDevices",list);
+        data.put("documentDevices",list.stream().map(DocumentDevice::toChangeWord).collect(Collectors.toList()));
         return data;
     }