From e2a25ecf2feaf04ca7619c101e5d4a03a659a124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 27 Nov 2019 13:48:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E9=99=A4=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/core/apiservice/util/ResourceUtil.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/ResourceUtil.java b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/ResourceUtil.java index 7d8b846..d4d82c5 100644 --- a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/ResourceUtil.java +++ b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/ResourceUtil.java @@ -38,11 +38,13 @@ public class ResourceUtil extends TestBase { new ResourceUtil().initResource(); } + @Autowired + private SnowflakeIdMaker snowflakeIdMaker; + @Test public void initResource() { File file = new File("C:\\Users\\yunha\\Desktop\\资源文件.xlsx"); try { - SnowflakeIdMaker snowflakeIdMaker = new SnowflakeIdMaker(); Workbook wb = new XSSFWorkbook(file); // 前端资源 Sheet webSheet = wb.getSheet("SUM"); @@ -78,15 +80,15 @@ public class ResourceUtil extends TestBase { //中文 sysLocaleResource = new SysLocaleResource(); sysLocaleResource.setId(snowflakeIdMaker.nextId()); - sysLocaleResource.setLanguageCode(cn.estsh.i3plus.core.apiservice.util.ResourceUtil.YY.CN.getValue()); - sysLocaleResource.setLanguageNameRdd(cn.estsh.i3plus.core.apiservice.util.ResourceUtil.YY.CN.getDescription()); + sysLocaleResource.setLanguageCode(YY.CN.getValue()); + sysLocaleResource.setLanguageNameRdd(YY.CN.getDescription()); sysLocaleResource.setResourceType(resType); sysLocaleResource.setSoftType(softType); sysLocaleResource.setResourceKey(key); sysLocaleResource.setResourceValue(cnVal); ConvertBean.serviceModelInitialize(sysLocaleResource, PlatformConstWords.SYSTEM_INIT_USER); - item.put(cn.estsh.i3plus.core.apiservice.util.ResourceUtil.YY.CN.getValue(), sysLocaleResource); + item.put(YY.CN.getValue(), sysLocaleResource); System.out.println(JSON.toJSONString(sysLocaleResource)); @@ -95,15 +97,15 @@ public class ResourceUtil extends TestBase { sysLocaleResource.setId(snowflakeIdMaker.nextId()); sysLocaleResource.setResourceType(resType); sysLocaleResource.setSoftType(softType); - sysLocaleResource.setLanguageCode(cn.estsh.i3plus.core.apiservice.util.ResourceUtil.YY.EN.getValue()); - sysLocaleResource.setLanguageNameRdd(cn.estsh.i3plus.core.apiservice.util.ResourceUtil.YY.EN.getDescription()); + sysLocaleResource.setLanguageCode(YY.EN.getValue()); + sysLocaleResource.setLanguageNameRdd(YY.EN.getDescription()); sysLocaleResource.setResourceType(resType); sysLocaleResource.setSoftType(softType); sysLocaleResource.setResourceKey(key); sysLocaleResource.setResourceValue(enVal); ConvertBean.serviceModelInitialize(sysLocaleResource, PlatformConstWords.SYSTEM_INIT_USER); - item.put(cn.estsh.i3plus.core.apiservice.util.ResourceUtil.YY.EN.getValue(), sysLocaleResource); + item.put(YY.EN.getValue(), sysLocaleResource); System.out.println(JSON.toJSONString(sysLocaleResource)); }