解除冲突

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));
             }