数据初始

src/main/resources/modules/SpringBoot/test/DataInit.java

@@ -300,8 +300,13 @@ public class DataInit {
         //endregion
         </#if>
     }
+<#if project.frameValue() = 1>
 
     private void createDict(String name, String comment, String[][] items) {
+        DictFindRequest dictFindRequest = new DictFindRequest();
+        dictFindRequest.setDictName(name);
+        DictFindResponse dictFindResponse = dictManager.find(dictFindRequest, token);
+        if (dictFindResponse.getResult().size() == 0) {
             DictCreateRequest dictCreateRequest = new DictCreateRequest();
             dictCreateRequest.setDictName(name);
             dictCreateRequest.setDictComment(comment);
@@ -310,27 +315,40 @@ public class DataInit {
             DictCreateResponse dictCreateResponse = dictManager.create(dictCreateRequest, token);
             printError(dictCreateResponse);
             assertTrue(!dictCreateResponse.hasError());
+        }
+
+        // 通过查询获取字典项已有数量
+        DictItemFindRequest dictItemFindRequest = new DictItemFindRequest();
+        dictItemFindRequest.setDictName(name);
+        DictItemFindResponse dictItemFindResponse = dictItemManager.find(dictItemFindRequest, token);
 
         for (int i = 0; i < items.length; i++) {
             String[] item = items[i];
+            dictItemFindRequest.setKey(item[0]);
+            DictItemFindResponse dictItemFindResponse_ = dictItemManager.find(dictItemFindRequest, token);
+            if (dictItemFindResponse_.getResult().size() == 0) {
                 DictItemCreateRequest dictItemCreateRequest = new DictItemCreateRequest();
                 dictItemCreateRequest.setDictName(name);
                 dictItemCreateRequest.setKey(item[0]);
                 dictItemCreateRequest.setValue(item[1]);
-            dictItemCreateRequest.setSort(i);
+                dictItemCreateRequest.setSort((int) (i + dictItemFindResponse.getTotalCount()));
                 dictItemCreateRequest.setValid(true);
                 DictItemCreateResponse dictItemCreateResponse = dictItemManager.create(dictItemCreateRequest, token);
                 printError(dictItemCreateResponse);
                 assertTrue(!dictItemCreateResponse.hasError());
             }
         }
-    <#if project.frameValue() = 1>
+    }
 
     private Res createRes(String code, String name, String resType, String value) {
-        return createRes(code,name,resType,value,false);
+        return createRes(code, name, resType, value, false);
     }
 
     private Res createRes(String code, String name, String resType, String value, boolean free) {
+        ResFindRequest resFindRequest = new ResFindRequest();
+        resFindRequest.setResCode(code);
+        ResFindResponse resFindResponse = resManager.find(resFindRequest, token);
+        if (resFindResponse.getResult().size() == 0) {
             ResCreateRequest resCreateRequest = new ResCreateRequest();
             resCreateRequest.setResName(name);
             resCreateRequest.setResCode(code);
@@ -340,25 +358,24 @@ public class DataInit {
             resCreateRequest.setValid(true);
             ResCreateResponse resCreateResponse = resManager.create(resCreateRequest, token);
             printError(resCreateResponse);
-        if (resCreateResponse.hasError() && resCreateResponse.getErrors().get(0).getMessage().equals(Message.INSERT_DUPLICATE)) {
-            ResFindRequest resFindRequest = new ResFindRequest();
-            resFindRequest.setResCode(code);
-            ResFindResponse resFindResponse = resManager.find(resFindRequest, token);
-            return resFindResponse.getResult().get(0);
-        } else if (resCreateResponse.hasError()) {
             assertTrue(!resCreateResponse.hasError());
-            return null;
+
-        } else {
             Res res = new Res();
             res.setResCode(code);
             res.setResName(name);
             res.setResType(resType);
             res.setId(resCreateResponse.getId());
             return res;
+        } else {
+            return resFindResponse.getResult().get(0);
         }
     }
 
     private Long createRole(String roleCode, String roleName, String roleComment) {
+        RoleFindRequest roleFindRequest = new RoleFindRequest();
+        roleFindRequest.setCode(roleCode);
+        RoleFindResponse roleFindResponse = roleManager.find(roleFindRequest, token);
+        if (roleFindResponse.getResult().size() == 0) {
             RoleCreateRequest roleCreateRequest = new RoleCreateRequest();
             roleCreateRequest.setCode(roleCode);
             roleCreateRequest.setName(roleName);
@@ -367,6 +384,9 @@ public class DataInit {
             printError(roleCreateResponse);
             assertTrue(!roleCreateResponse.hasError());
             return roleCreateResponse.getId();
+        } else {
+            return roleFindResponse.getResult().get(0).getId();
+        }
     }
 
     private void allocateRes(Long roleId, String roleCode, Long resId, String resCode) {
@@ -381,11 +401,11 @@ public class DataInit {
         printError(roleResCheckResponse);
         assertTrue(!roleResCheckResponse.hasError());
     }
-    </#if>
 
     private void printError(BaseResponse response) {
         if (response.hasError()) {
             System.err.println("==========>" + MapperUtil.toJson(response));
         }
     }
+</#if>
 }