修改热门词汇

fill-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java

@@ -118,7 +118,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
     private void addPubdatum(MatterDatumEntity entity, Context context) {
         if (!ObjectUtils.isEmpty(entity.getPub()) && entity.getPub() == YesNoEnum.YES.getValue()) {
             int count = pubdatumService.count(new PubdatumQuery().materialName(entity.getMaterialName()), context);
-            if(count>0){
+            if (count > 0) {
                 throw new AppException("当前公共库已存在当前材料名！");
             }
 
@@ -155,7 +155,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
         }
         //校验材料名是否重复
         int count = this.count(new MatterDatumQuery().materialName(entity.getMaterialName()), context);
-        if(count>0){
+        if (count > 0) {
             throw new AppException("当前材料名称已存在！");
         }
 
@@ -383,8 +383,12 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
                     log.error("渲染模板失败：", e);
                 } finally {
                     try {
-                        template.close();
-                        byteArrayOutputStream.close();
+                        if (template != null) {
+                            template.close();
+                        }
+                        if (byteArrayOutputStream != null) {
+                            byteArrayOutputStream.close();
+                        }
                     } catch (IOException e) {
                         log.error("ioEx：", e);
                     }
@@ -437,8 +441,8 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
     }
 
     private MatterDatumEntity updateOrSave(PubdatumEntity pubdatumEntity, Long matterId, Long siteId, Context context) {
-        int count = this.count(new MatterDatumQuery().siteId(siteId).matterId(matterId).materialName(pubdatumEntity.getMaterialName()),context);
-        if (count==0) {
+        int count = this.count(new MatterDatumQuery().siteId(siteId).matterId(matterId).materialName(pubdatumEntity.getMaterialName()), context);
+        if (count == 0) {
             MatterDatumEntity entity = new MatterDatumEntity();
             entity.initAttrValue();
             BeanUtils.copyProperties(pubdatumEntity, entity, new String[]{"id", "matterId"});

fill-manager/src/test/java/com/mortals/httpclient/mortals/MortalsFillMatterDatumPrintController.http → fill-manager/src/test/java/com/mortals/httpclient/matter/MatterDatumPrintController.http

@@ -14,55 +14,55 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 %}
 
 ###打印提交列表
-POST {{baseUrl}}/mortals/fill/matter/datum/print/list
+POST {{baseUrl}}/matter/datum/print/list
 Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-    "orderId":"zxcm1e",
-    "materialId":931,
-    "materialName":"hvopoo",
-    "page":78,
+    "orderId":"d7y4sx",
+    "materialId":635,
+    "materialName":"h0er7b",
+    "page":784,
     "type":1,
-    "docPath":"onj9bb",
-    "formContent":"2lxxse",
+    "docPath":"7hms82",
+    "formContent":"zoqx4s",
     "page":1,
     "size":10
 }
 
 
 ###打印提交更新与保存
-POST {{baseUrl}}/mortals/fill/matter/datum/print/save
+POST {{baseUrl}}/matter/datum/print/save
 Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-        "orderId":"3v6b72",
-        "materialId":291,
-        "materialName":"v60a07",
-        "page":105,
-        "type":1,
-        "docPath":"bjwc0j",
-        "formContent":"6pstcu",
+        "siteId":3,
+        "orderId":"123456789",
+        "materialId":1,
+        "materialName":"测试表单材料",
+        "type":2,
+        "docPath":"/mortals/app/data/file/fileupload/1670485801511.docx",
+        "formContent":"表单内容"
 }
 
 > {%
-client.global.set("MortalsFillMatterDatumPrint_id", JSON.parse(response.body).data.id);
+client.global.set("MatterDatumPrint_id", JSON.parse(response.body).data.id);
 %}
 
 ###打印提交查看
-GET {{baseUrl}}/mortals/fill/matter/datum/print/info?id={{MortalsFillMatterDatumPrint_id}}
+GET {{baseUrl}}/matter/datum/print/info?id={{MatterDatumPrint_id}}
 Authorization: {{authToken}}
 Accept: application/json
 
 ###打印提交编辑
-GET {{baseUrl}}/mortals/fill/matter/datum/print/edit?id={{MortalsFillMatterDatumPrint_id}}
+GET {{baseUrl}}/matter/datum/print/edit?id={{MatterDatumPrint_id}}
 Authorization: {{authToken}}
 Accept: application/json
 
 
 ###打印提交删除
-GET {{baseUrl}}/mortals/fill/matter/datum/print/delete?id={{MortalsFillMatterDatumPrint_id}}
+GET {{baseUrl}}/matter/datum/print/delete?id={{MatterDatumPrint_id}}
 Authorization: {{authToken}}
 Accept: application/json