From 313fe7a007e4ce248ed37c1bbfaf4b832c2f7afa Mon Sep 17 00:00:00 2001 From: wangbing Date: Fri, 7 Aug 2020 15:27:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=9D=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/SpringBoot/test/DataInit.java | 110 +++++++++++------- 1 file changed, 65 insertions(+), 45 deletions(-) diff --git a/src/main/resources/modules/SpringBoot/test/DataInit.java b/src/main/resources/modules/SpringBoot/test/DataInit.java index 139578a5..08280d36 100644 --- a/src/main/resources/modules/SpringBoot/test/DataInit.java +++ b/src/main/resources/modules/SpringBoot/test/DataInit.java @@ -300,73 +300,93 @@ public class DataInit { //endregion } +<#if project.frameValue() = 1> private void createDict(String name, String comment, String[][] items) { - DictCreateRequest dictCreateRequest = new DictCreateRequest(); - dictCreateRequest.setDictName(name); - dictCreateRequest.setDictComment(comment); - 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()); + 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); + 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(); - dictItemCreateRequest.setDictName(name); - dictItemCreateRequest.setKey(item[0]); - dictItemCreateRequest.setValue(item[1]); - dictItemCreateRequest.setSort(i); - dictItemCreateRequest.setValid(true); - DictItemCreateResponse dictItemCreateResponse = dictItemManager.create(dictItemCreateRequest, token); - printError(dictItemCreateResponse); - assertTrue(!dictItemCreateResponse.hasError()); + 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((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) { - ResCreateRequest resCreateRequest = new ResCreateRequest(); - resCreateRequest.setResName(name); - resCreateRequest.setResCode(code); - resCreateRequest.setResType(resType); - resCreateRequest.setResValue(value); - resCreateRequest.setFree(free); - 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()) { + 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); + resCreateRequest.setResType(resType); + resCreateRequest.setResValue(value); + resCreateRequest.setFree(free); + resCreateRequest.setValid(true); + ResCreateResponse resCreateResponse = resManager.create(resCreateRequest, token); + printError(resCreateResponse); 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(); - roleCreateRequest.setCode(roleCode); - roleCreateRequest.setName(roleName); - roleCreateRequest.setComment(roleComment); - RoleCreateResponse roleCreateResponse = roleManager.create(roleCreateRequest, token); - printError(roleCreateResponse); - assertTrue(!roleCreateResponse.hasError()); - return roleCreateResponse.getId(); + 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); + 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()); } - private void printError(BaseResponse response) { if (response.hasError()) { System.err.println("==========>" + MapperUtil.toJson(response)); } } + } \ No newline at end of file