Index: forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManager.java =================================================================== diff -u -r15775 -r15780 --- forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManager.java (.../BasePoManager.java) (revision 15775) +++ forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManager.java (.../BasePoManager.java) (revision 15780) @@ -51,6 +51,18 @@ */ public T get(String id); /** + * 根据id获取对象 + * @param id 要获取对象的id + * @return 成功返回对应的对象，否则返回null + */ + public T getForUpdate(Long id); + /** + * 根据id获取对象 + * @param id 要获取对象的id + * @return 成功返回对应的对象，否则返回null + */ + public T getForUpdate(String id); + /** * 根据属性值获取对象 * @param property 属性名 * @param value 属性值 Index: ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java =================================================================== diff -u -r15543 -r15780 --- ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java (.../InitializeDataManagerImpl.java) (revision 15543) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java (.../InitializeDataManagerImpl.java) (revision 15780) @@ -750,22 +750,25 @@ pathList.forEach(new Consumer() { @Override public void accept(java.nio.file.Path path) { - String fileName = path.getFileName().toString(); +// String fileName = path.getFileName().toString(); String json = FileUtils.readAllContentAsString(path, "utf-8"); if (StringUtils.isBlank(json)) { return; } + + JSONObject obj = JSONObject.fromObject(json); + String name = JSONUtil.optString(obj, + "name", ""); // 判断该模板是否已存在 LabelTemplate labelTemplate = (LabelTemplate) objectDao .getByProperty( LabelTemplate.class.getSimpleName(), - "name", fileName); + "name", name); if (labelTemplate != null) { return; } labelTemplate = new LabelTemplate(); - JSONObject obj = JSONObject.fromObject(json); String dataSourceName = JSONUtil.optString(obj, "dataSourceName", ""); String description = JSONUtil.optString(obj, @@ -777,7 +780,7 @@ String templateInfo = JSONUtil.optString(obj, "templateInfo", ""); - labelTemplate.setName(fileName); + labelTemplate.setName(name); labelTemplate.setDataSourceName(dataSourceName); labelTemplate.setDescription(description); labelTemplate.setWidth(width); Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/C420283489E07C19F96042E5C225E533 =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/C420283489E07C19F96042E5C225E533 (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/C420283489E07C19F96042E5C225E533 (revision 15780) @@ -0,0 +1 @@ +{"programCodes":"LODOP.PRINT_INITA(0,0,\"60.01mm\",\"80.01mm\",\"\");\r\nLODOP.SET_PRINT_MODE(\"PROGRAM_CONTENT_BYVAR\",true);\r\nLODOP.ADD_PRINT_TEXTA(\"name\",\"2.01mm\",\"0mm\",\"60.01mm\",\"29mm\",obj.name);\r\nLODOP.SET_PRINT_STYLEA(0,\"Alignment\",2);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.name\");\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"31.01mm\",\"1.01mm\",\"10mm\",\"6.01mm\",\"灭菌:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"31.01mm\",\"32.99mm\",\"15mm\",\"6.01mm\",\"装配员:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"36.99mm\",\"1.01mm\",\"10mm\",\"6.01mm\",\"失效:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"36.99mm\",\"32.99mm\",\"15mm\",\"6.01mm\",\"审核员:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.ADD_PRINT_TEXTA(\"sterilizationDate\",\"31.01mm\",\"9mm\",\"30mm\",\"6.01mm\",obj.sterilizationDate);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.sterilizationDate\");\r\nLODOP.ADD_PRINT_TEXTA(\"operator\",\"31.01mm\",\"45.01mm\",\"30mm\",\"6.01mm\",obj.operator);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.operator\");\r\nLODOP.ADD_PRINT_TEXTA(\"validDate\",\"36.99mm\",\"9mm\",\"30mm\",\"6.01mm\",obj.validDate);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.validDate\");\r\nLODOP.ADD_PRINT_TEXTA(\"reviewer\",\"36.99mm\",\"45.01mm\",\"30mm\",\"6.01mm\",obj.reviewer);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.reviewer\");\r\nLODOP.ADD_PRINT_BARCODE(\"44mm\",\"10mm\",\"40mm\",\"17.99mm\",\"128Auto\",obj.barcode);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.barcode\");\r\nLODOP.ADD_PRINT_TEXTA(\"name\",\"64mm\",\"0mm\",\"60.01mm\",\"2.99mm\",obj.name);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",6);\r\nLODOP.SET_PRINT_STYLEA(0,\"Alignment\",2);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.name\");\r\nLODOP.ADD_PRINT_BARCODE(\"69mm\",\"10mm\",\"40mm\",\"10mm\",\"128Auto\",obj.barcode);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.barcode\");\r\n","templateInfo":"{\"tableConfigs\":[]}","name":"普通中标签","width":"60mm","description":"","fullName":"模板-普通中标签","id":21,"dataSourceName":"普通器械包","height":"80mm"} Index: forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java =================================================================== diff -u -r15775 -r15780 --- forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java (.../BasePoManagerImpl.java) (revision 15775) +++ forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java (.../BasePoManagerImpl.java) (revision 15780) @@ -103,6 +103,16 @@ } return getFirst(hql); } + @Override + public T getForUpdate(Long id) { + T o = (T)objectDao.getByID_ForUpdate(poName, id); + return o; + } + @Override + public T getForUpdate(String id) { + T o = (T)objectDao.getByID_ForUpdate(poName, id); + return o; + } @SuppressWarnings("unchecked") @Override Fisheye: Tag 15780 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/普通中标签'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/842546067B069765692FF6FF1D76834A =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/842546067B069765692FF6FF1D76834A (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/842546067B069765692FF6FF1D76834A (revision 15780) @@ -0,0 +1 @@ +{"programCodes":"LODOP.PRINT_INITA(0,0,\"50mm\",\"29.9mm\",\"\");\r\nLODOP.SET_PRINT_MODE(\"PROGRAM_CONTENT_BYVAR\",true);\r\nLODOP.ADD_PRINT_TEXTA(\"name\",\"1.1mm\",\"0mm\",\"50mm\",\"5mm\",obj.name);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",7);\r\nLODOP.SET_PRINT_STYLEA(0,\"Alignment\",2);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.name\");\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"10.1mm\",\"1.1mm\",\"11.9mm\",\"6.1mm\",\"灭菌日期:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",5);\r\nLODOP.ADD_PRINT_TEXTA(\"sterilizationDate\",\"10.1mm\",\"13mm\",\"20.1mm\",\"6.1mm\",obj.sterilizationDate);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",5);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.sterilizationDate\");\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"14mm\",\"1.1mm\",\"11.9mm\",\"6.1mm\",\"失效日期:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",5);\r\nLODOP.ADD_PRINT_TEXTA(\"validDate\",\"14mm\",\"13mm\",\"20.1mm\",\"6.1mm\",obj.validDate);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",5);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.validDate\");\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"10.1mm\",\"25.9mm\",\"11.9mm\",\"6.1mm\",\"灭菌程序\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",5);\r\nLODOP.ADD_PRINT_TEXTA(\"sterilingType\",\"10.1mm\",\"38.1mm\",\"20.1mm\",\"6.1mm\",obj.sterilingType);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",5);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.sterilingType\");\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"14mm\",\"25.9mm\",\"11.9mm\",\"6.1mm\",\"灭菌员:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",5);\r\nLODOP.ADD_PRINT_TEXTA(\"sterilizationUser\",\"14mm\",\"38.1mm\",\"20.1mm\",\"6.1mm\",obj.sterilizationUser);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",5);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.sterilizationUser\");\r\nLODOP.ADD_PRINT_BARCODE(\"18mm\",\"11.1mm\",\"29.9mm\",\"10.1mm\",\"128Auto\",obj.barcode);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.barcode\");\r\nLODOP.ADD_PRINT_TEXTA(\"depart\",\"6.1mm\",\"0mm\",\"50mm\",\"4mm\",obj.depart);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",7);\r\nLODOP.SET_PRINT_STYLEA(0,\"Alignment\",2);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.depart\");\r\n","templateInfo":"{\"tableConfigs\":[]}","name":"外部代理灭菌小标签","width":"50mm","description":"外部代理灭菌小标签","fullName":"模板-外部代理灭菌小标签","id":19,"dataSourceName":"外部代理灭菌包","height":"30mm"} Index: forgon-tools/src/main/java/com/forgon/tools/crypto/coder/CoderEncryption.java =================================================================== diff -u -r12331 -r15780 --- forgon-tools/src/main/java/com/forgon/tools/crypto/coder/CoderEncryption.java (.../CoderEncryption.java) (revision 12331) +++ forgon-tools/src/main/java/com/forgon/tools/crypto/coder/CoderEncryption.java (.../CoderEncryption.java) (revision 15780) @@ -3,13 +3,16 @@ */ package com.forgon.tools.crypto.coder; +import java.nio.charset.Charset; import java.security.MessageDigest; import javax.crypto.KeyGenerator; import javax.crypto.Mac; import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; +import com.forgon.tools.util.ForgonStringUtils; + import sun.misc.BASE64Decoder; import sun.misc.BASE64Encoder; @@ -75,6 +78,18 @@ return md5.digest(); } + + public static String encryptMD5(String str,String charset) { + String retStr = ""; + byte[] bytes = str.getBytes(Charset.forName(charset)); + try { + byte[] md5Bytes = CoderEncryption.encryptMD5(bytes); + retStr = ForgonStringUtils.encodeHexStr(md5Bytes, false); + } catch (Exception e) { + throw new RuntimeException("计算材料MD5出错!" + e.getMessage()); + } + return retStr; + } /** * SHA加密 Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/DF36F57E8C46F51F799FDCDF6E71D311 =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/DF36F57E8C46F51F799FDCDF6E71D311 (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/DF36F57E8C46F51F799FDCDF6E71D311 (revision 15780) @@ -0,0 +1 @@ +{"programCodes":"LODOP.PRINT_INITA(0,0,\"60.1mm\",\"79.9mm\",\"\");\r\nLODOP.SET_PRINT_MODE(\"PROGRAM_CONTENT_BYVAR\",true);\r\nLODOP.ADD_PRINT_TEXTA(\"name\",\"2.1mm\",\"0mm\",\"60.1mm\",\"24.1mm\",obj.name);\r\nLODOP.SET_PRINT_STYLEA(0,\"Alignment\",2);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.name\");\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"27mm\",\"1.1mm\",\"10.1mm\",\"6.9mm\",\"灭菌:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.ADD_PRINT_TEXTA(\"sterilizationDate\",\"27mm\",\"11.1mm\",\"34.1mm\",\"6.9mm\",obj.sterilizationDate);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.sterilizationDate\");\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"27mm\",\"33.1mm\",\"15.1mm\",\"6.9mm\",\"装配员:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.ADD_PRINT_TEXTA(\"operator\",\"27mm\",\"47.9mm\",\"29.9mm\",\"6.9mm\",obj.operator);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.operator\");\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"32mm\",\"1.1mm\",\"10.1mm\",\"6.9mm\",\"失效:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.ADD_PRINT_TEXTA(\"validDate\",\"32mm\",\"11.1mm\",\"34.1mm\",\"6.9mm\",obj.validDate);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.validDate\");\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"32mm\",\"33.1mm\",\"15.1mm\",\"6.9mm\",\"审核员:\");\r\nLODOP.ADD_PRINT_TEXTA(\"reviewer\",\"32mm\",\"47.9mm\",\"29.9mm\",\"6.9mm\",obj.reviewer);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.reviewer\");\r\nLODOP.ADD_PRINT_BARCODE(\"43.1mm\",\"10.1mm\",\"40mm\",\"18mm\",\"128Auto\",obj.barcode);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.barcode\");\r\nLODOP.ADD_PRINT_TEXTA(\"name\",\"64mm\",\"0mm\",\"60.1mm\",\"2.9mm\",obj.name);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",5);\r\nLODOP.SET_PRINT_STYLEA(0,\"Alignment\",2);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.name\");\r\nLODOP.ADD_PRINT_BARCODE(\"69.1mm\",\"10.1mm\",\"40mm\",\"10.1mm\",\"128Auto\",obj.barcode);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.barcode\");\r\n","templateInfo":"{\"tableConfigs\":[]}","name":"外来器械中标签","width":"60mm","description":"外来器械中标签","fullName":"模板-外来器械中标签","id":22,"dataSourceName":"外来器械包","height":"80mm"} Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/7D6092E7E5F552331A5D8ED443E0BC0A =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/7D6092E7E5F552331A5D8ED443E0BC0A (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/7D6092E7E5F552331A5D8ED443E0BC0A (revision 15780) @@ -0,0 +1 @@ +{"programCodes":"LODOP.PRINT_INITA(0,0,\"50.01mm\",\"30mm\",\"\");\r\nLODOP.SET_PRINT_MODE(\"PROGRAM_CONTENT_BYVAR\",true);\r\nLODOP.ADD_PRINT_BARCODE(\"17.01mm\",\"10mm\",\"30mm\",\"10mm\",\"128Auto\",obj.barcode);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.barcode\");\r\nLODOP.ADD_PRINT_TEXTA(\"name\",\"1.01mm\",\"0mm\",\"50.01mm\",\"5mm\",obj.name);\r\nLODOP.SET_PRINT_STYLEA(0,\"Alignment\",2);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.name\");\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"6.01mm\",\"1.01mm\",\"10mm\",\"6.01mm\",\"灭菌:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.ADD_PRINT_TEXTA(\"sterilizationDate\",\"6.01mm\",\"7.99mm\",\"30mm\",\"6.01mm\",obj.sterilizationDate);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.sterilizationDate\");\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"6.01mm\",\"30mm\",\"10mm\",\"6.01mm\",\"装配:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.ADD_PRINT_TEXTA(\"operator\",\"6.01mm\",\"37.99mm\",\"30mm\",\"6.01mm\",obj.operator);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.operator\");\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"12.01mm\",\"1.01mm\",\"10mm\",\"6.01mm\",\"失效:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.ADD_PRINT_TEXTA(\"validDate\",\"12.01mm\",\"7.99mm\",\"30mm\",\"6.01mm\",obj.validDate);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.validDate\");\r\nLODOP.ADD_PRINT_TEXTA(\"a\",\"12.01mm\",\"30mm\",\"10mm\",\"6.01mm\",\"审核:\");\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.ADD_PRINT_TEXTA(\"reviewer\",\"12.01mm\",\"37.99mm\",\"30mm\",\"6.01mm\",obj.reviewer);\r\nLODOP.SET_PRINT_STYLEA(0,\"FontSize\",8);\r\nLODOP.SET_PRINT_STYLEA(0,\"ContentVName\",\"obj.reviewer\");\r\n","templateInfo":"{\"tableConfigs\":[]}","name":"普通小标签","width":"50mm","description":"","fullName":"模板-普通小标签","id":18,"dataSourceName":"普通器械包","height":"30mm"} Fisheye: Tag 15780 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/普通小标签'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 15780 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/外部代理灭菌小标签'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 15780 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplates/外来器械中标签'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java =================================================================== diff -u -r15473 -r15780 --- ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java (.../LabelTemplateAction.java) (revision 15473) +++ ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java (.../LabelTemplateAction.java) (revision 15780) @@ -17,6 +17,7 @@ import com.forgon.disinfectsystem.labeltemplate.service.LabelTemplateManager; import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.StrutsResponseUtils; +import com.forgon.tools.crypto.coder.CoderEncryption; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.util.FileUtils; import com.forgon.tools.util.PathUtils; @@ -170,7 +171,15 @@ webRoot); for (LabelTemplate labelTemplate : list) { JSONObject jsonObject = JSONObject.fromObject(labelTemplate); - String path = directory + labelTemplate.getName(); + String name = labelTemplate.getName(); + if(StringUtils.isBlank(name)){ + continue; + } + String fileName = CoderEncryption.encryptMD5(name,"UTF-8"); + if(StringUtils.isBlank(fileName)){ + continue; + } + String path = directory + fileName; FileUtils.writeStringToFile(path, jsonObject.toString(), "utf-8"); }