数据初始

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

@@ -300,73 +300,93 @@ public class DataInit {
         //endregion
         </#if>
     }
+<#if project.frameValue() = 1>
 
     private void createDict(String name, String comment, String[][] items) {
-        DictCreateRequest dictCreateRequest = new DictCreateRequest();
+        DictFindRequest dictFindRequest = new DictFindRequest();
-        dictCreateRequest.setDictName(name);
+        dictFindRequest.setDictName(name);
-        dictCreateRequest.setDictComment(comment);
+        DictFindResponse dictFindResponse = dictManager.find(dictFindRequest, token);
-        dictCreateRequest.setVersion(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        if (dictFindResponse.getResult().size() == 0) {
-        dictCreateRequest.setValid(true);
+            DictCreateRequest dictCreateRequest = new DictCreateRequest();
-        DictCreateResponse dictCreateResponse = dictManager.create(dictCreateRequest, token);
+            dictCreateRequest.setDictName(name);
-        printError(dictCreateResponse);
+            dictCreateRequest.setDictComment(comment);
-        assertTrue(!dictCreateResponse.hasError());
+            dictCreateRequest.setVersion(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+            dictCreateRequest.setValid(true);
+            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];
-            DictItemCreateRequest dictItemCreateRequest = new DictItemCreateRequest();
+            dictItemFindRequest.setKey(item[0]);
-            dictItemCreateRequest.setDictName(name);
+            DictItemFindResponse dictItemFindResponse_ = dictItemManager.find(dictItemFindRequest, token);
-            dictItemCreateRequest.setKey(item[0]);
+            if (dictItemFindResponse_.getResult().size() == 0) {
-            dictItemCreateRequest.setValue(item[1]);
+                DictItemCreateRequest dictItemCreateRequest = new DictItemCreateRequest();
-            dictItemCreateRequest.setSort(i);
+                dictItemCreateRequest.setDictName(name);
-            dictItemCreateRequest.setValid(true);
+                dictItemCreateRequest.setKey(item[0]);
-            DictItemCreateResponse dictItemCreateResponse = dictItemManager.create(dictItemCreateRequest, token);
+                dictItemCreateRequest.setValue(item[1]);
-            printError(dictItemCreateResponse);
+                dictItemCreateRequest.setSort((int) (i + dictItemFindResponse.getTotalCount()));
-            assertTrue(!dictItemCreateResponse.hasError());
+                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) {
-        ResCreateRequest resCreateRequest = new ResCreateRequest();
+        ResFindRequest resFindRequest = new ResFindRequest();
-        resCreateRequest.setResName(name);
+        resFindRequest.setResCode(code);
-        resCreateRequest.setResCode(code);
+        ResFindResponse resFindResponse = resManager.find(resFindRequest, token);
-        resCreateRequest.setResType(resType);
+        if (resFindResponse.getResult().size() == 0) {
-        resCreateRequest.setResValue(value);
+            ResCreateRequest resCreateRequest = new ResCreateRequest();
-        resCreateRequest.setFree(free);
+            resCreateRequest.setResName(name);
-        resCreateRequest.setValid(true);
+            resCreateRequest.setResCode(code);
-        ResCreateResponse resCreateResponse = resManager.create(resCreateRequest, token);
+            resCreateRequest.setResType(resType);
-        printError(resCreateResponse);
+            resCreateRequest.setResValue(value);
-        if (resCreateResponse.hasError() && resCreateResponse.getErrors().get(0).getMessage().equals(Message.INSERT_DUPLICATE)) {
+            resCreateRequest.setFree(free);
-            ResFindRequest resFindRequest = new ResFindRequest();
+            resCreateRequest.setValid(true);
-            resFindRequest.setResCode(code);
+            ResCreateResponse resCreateResponse = resManager.create(resCreateRequest, token);
-            ResFindResponse resFindResponse = resManager.find(resFindRequest, token);
+            printError(resCreateResponse);
-            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) {
-        RoleCreateRequest roleCreateRequest = new RoleCreateRequest();
+        RoleFindRequest roleFindRequest = new RoleFindRequest();
-        roleCreateRequest.setCode(roleCode);
+        roleFindRequest.setCode(roleCode);
-        roleCreateRequest.setName(roleName);
+        RoleFindResponse roleFindResponse = roleManager.find(roleFindRequest, token);
-        roleCreateRequest.setComment(roleComment);
+        if (roleFindResponse.getResult().size() == 0) {
-        RoleCreateResponse roleCreateResponse = roleManager.create(roleCreateRequest, token);
+            RoleCreateRequest roleCreateRequest = new RoleCreateRequest();
-        printError(roleCreateResponse);
+            roleCreateRequest.setCode(roleCode);
-        assertTrue(!roleCreateResponse.hasError());
+            roleCreateRequest.setName(roleName);
-        return roleCreateResponse.getId();
+            roleCreateRequest.setComment(roleComment);
+            RoleCreateResponse roleCreateResponse = roleManager.create(roleCreateRequest, token);
+            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>
 }