Merge pull request #259 from CodingCattwo/dev142

fix ignore path repeat
WeBankBlockchain · Dec 4, 2020 · 465e4d9 · 465e4d9
2 parents c99e230 + 0c92838
commit 465e4d9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/main/java/com/webank/webase/node/mgr/contract/ContractController.java b/src/main/java/com/webank/webase/node/mgr/contract/ContractController.java
@@ -279,7 +279,7 @@ public BaseResponse addContractPath(@Valid @RequestBody ContractPathParam param)
         if ("".equals(contractPath)) {
             contractPath = "/";
         }
-        int result = contractPathService.save(param.getGroupId(), contractPath);
+        int result = contractPathService.save(param.getGroupId(), contractPath, false);
         response.setData(result);
 
         log.info("end addContractPath. useTime:{} add result:{}",

diff --git a/src/main/java/com/webank/webase/node/mgr/contract/ContractPathService.java b/src/main/java/com/webank/webase/node/mgr/contract/ContractPathService.java
@@ -42,11 +42,15 @@ public List<TbContractPath> listContractPath(Integer groupId) {
      * @param pathName
      * @return
      */
-    public int save(Integer groupId, String pathName) {
+    public int save(Integer groupId, String pathName, boolean ignoreRepeat) {
         TbContractPath check = contractPathMapper.findOne(new ContractPathParam(groupId, pathName));
         if (check != null) {
-            log.error("save path, path exists check:{}", check);
-            throw new NodeMgrException(ConstantCode.CONTRACT_PATH_IS_EXISTS);
+            if (ignoreRepeat) {
+                return 0;
+            } else {
+                log.error("save path, path exists check:{}", check);
+                throw new NodeMgrException(ConstantCode.CONTRACT_PATH_IS_EXISTS);
+            }
         }
         TbContractPath contractPath = new TbContractPath();
         contractPath.setContractPath(pathName);

diff --git a/src/main/java/com/webank/webase/node/mgr/contract/ContractService.java b/src/main/java/com/webank/webase/node/mgr/contract/ContractService.java
@@ -127,8 +127,8 @@ private TbContract newContract(Contract contract) {
         contractMapper.add(tbContract);
         // save contract path
         log.debug("newContract save contract path");
-        // if exist, auto not save
-        contractPathService.save(contract.getGroupId(), contract.getContractPath());
+        // if exist, auto not save (ignor)
+        contractPathService.save(contract.getGroupId(), contract.getContractPath(), true);
         return tbContract;
     }