文件题名配置

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/feign/INodeBaseInfoServiceClient.java

@@ -0,0 +1,17 @@
+package org.springblade.manager.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import static org.springblade.core.launch.constant.AppConstant.APPLICATION_NAME_PREFIX;
+
+@FeignClient(value = APPLICATION_NAME_PREFIX + "manager")
+public interface INodeBaseInfoServiceClient {
+    /**
+     * 接口前缀
+     */
+    String API_PREFIX = "/api/manager/nodebaseinfo";
+
+    @GetMapping(API_PREFIX + "/getNameRuleByRule")
+    String getNameRuleByRule(String nameRule, String wbsId);
+}

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -163,6 +163,7 @@ public class InformationWriteQueryController extends BladeController {
     private final IRecycleBinService recycleBinService;
     private final WbsTreeContractStatisticsClientImpl wbsTreeContractStatisticsClient;
     private final IRecycleBinInfoService recycleBinInfoService;
+    private final INodeBaseInfoServiceClient nodeBaseInfoServiceClient;
 
 
     @Autowired
@@ -397,14 +398,14 @@ public class InformationWriteQueryController extends BladeController {
             if(StringUtils.isEmpty(dto1.getNameRule())){
                 throw new ServiceException("请输入题名规则");
             }
-          R result= wbsTreeContractClient.getNameRuleByRule(dto1.getNameRule(),dto1.getWbsId());
+           String result=nodeBaseInfoServiceClient.getNameRuleByRule(dto1.getNameRule(),dto1.getWbsId());
 //            String sql="select p_key_id,ancestors_p_id from m_wbs_tree_contract where p_key_id="+dto1.getWbsId()+" and is_deleted=0";
 //            WbsTreeContract contract = jdbcTemplate.queryForObject(sql, new BeanPropertyRowMapper<>(WbsTreeContract.class));
 //            String result="";
 //            if(contract!=null){
 //                result= createFileTitle(contract, dto1.getNameRule());
 //            }
-            list.add(new PreviewNodeNameVO1(dto1.getWbsId(),result.getData().toString()));
+            list.add(new PreviewNodeNameVO1(dto1.getWbsId(),result.toString()));
         }
         return R.data(list);
     }

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/NodeBaseInfoController.java

@@ -50,9 +50,7 @@ import org.springblade.manager.service.INodeBaseInfoService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  *  控制器
@@ -163,6 +161,14 @@ public class NodeBaseInfoController extends BladeController {
         return R.status(update);
 	}
 
+
+    @GetMapping("/getNameRuleByRule")
+    @ApiOperationSupport(order = 32)
+    @ApiOperation(value = "节点配置根据选择的文件题名规则获取文件题名", notes = "传入规则和节点pkeyId")
+    public R getNameRuleByRule(@RequestParam String nameRule,@RequestParam Long pkeyId){
+        return R.data( nodeBaseInfoService.getNameRuleByRule(nameRule,pkeyId));
+    }
+
     public R synPDFInfo(String contractId, String nodeId, String classify, String projectId,Map<Long,Map<String,Object>>dataMap) {
 
         if (contractId == null && StringUtils.isEmpty(contractId)) {

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeContractController.java

@@ -79,7 +79,6 @@ public class WbsTreeContractController extends BladeController {
 
     private final JdbcTemplate jdbcTemplate;
     private final IWbsTreeContractService iWbsTreeContractService;
-    private final IWbsTreePrivateService iWbsTreePrivateService;
     private final WbsTreeContractServiceImpl wbsTreeContractServiceImpl;
     private final ContractClient contractClient;
     private final IWbsParamService iWbsParamService;
@@ -88,8 +87,6 @@ public class WbsTreeContractController extends BladeController {
 
     private final ExcelTabController excelTabController;
 
-    private final INodeBaseInfoService nodeBaseInfoService;
-
 
     @GetMapping("/diGuiWbs")
     @ApiOperationSupport(order = 1)
@@ -166,37 +163,15 @@ public class WbsTreeContractController extends BladeController {
     @ApiOperationSupport(order = 32)
     @ApiOperation(value = "节点配置根据选择的文件题名规则获取文件题名", notes = "传入规则和节点pkeyId")
     public R getNameRuleByRule(@RequestParam String nameRule,@RequestParam Long pkeyId){
-        NodeBaseInfo nodeBaseInfo = nodeBaseInfoService.getBaseMapper().selectOne(new QueryWrapper<NodeBaseInfo>().eq("node_id", pkeyId));
-        if(nodeBaseInfo==null){
-            nodeBaseInfo = nodeBaseInfoService.getOrSaveNodeBaseInfo(pkeyId);
-        }
         String[] codes = nameRule.split("-");
         Arrays.sort(codes, Comparator.comparingInt(s -> Integer.parseInt(s.substring(1))));
-        StringBuilder result = new StringBuilder();
-        for (int i = 0; i < codes.length; i++) {
-            if(codes[i].equals("C0")){
-                result.append(nodeBaseInfo.getUnit());
-            } else if (codes[i].equals("C1")) {
-                result.append(nodeBaseInfo.getSubUnit());
-            }else if (codes[i].equals("C2")) {
-                result.append(nodeBaseInfo.getDivision());
-            }else if (codes[i].equals("C3")) {
-                result.append(nodeBaseInfo.getSubDivision());
-            }else if (codes[i].equals("C4")) {
-                result.append(nodeBaseInfo.getItem());
-            }else if (codes[i].equals("C5")) {
-                result.append(nodeBaseInfo.getSubItem());
-            }else if (codes[i].equals("C6")) {
-                result.append(nodeBaseInfo.getProcesses());
-            }
-        }
-//        nameRule= String.join("-", codes);
-//        String sql="Select * from m_wbs_tree_contract where p_key_id="+pkeyId;
-//        WbsTreeContract contract = jdbcTemplate.queryForObject(sql, new BeanPropertyRowMapper<>(WbsTreeContract.class));
-//        String result = iWbsParamService.createFileTitle1(contract, nameRule);
-//        RandomNumberHolder.RandomTemplateTypeclear();
-//        RandomNumberHolder.RandomWbsTreeContractclear();
-        return R.data(result.toString());
+        nameRule= String.join("-", codes);
+        String sql="Select * from m_wbs_tree_contract where p_key_id="+pkeyId;
+        WbsTreeContract contract = jdbcTemplate.queryForObject(sql, new BeanPropertyRowMapper<>(WbsTreeContract.class));
+        String result = iWbsParamService.createFileTitle1(contract, nameRule);
+        RandomNumberHolder.RandomTemplateTypeclear();
+        RandomNumberHolder.RandomWbsTreeContractclear();
+        return R.data(result);
     }
     //节点命名配置
     @GetMapping("/saveContractNameRule")

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/INodeBaseInfoServiceClientImpl.java

@@ -0,0 +1,16 @@
+package org.springblade.manager.feign;
+
+import lombok.AllArgsConstructor;
+import org.springblade.manager.service.INodeBaseInfoService;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@AllArgsConstructor
+public class INodeBaseInfoServiceClientImpl implements INodeBaseInfoServiceClient{
+
+    private final INodeBaseInfoService nodeBaseInfoService;
+    @Override
+    public String getNameRuleByRule(String nameRule, String wbsId) {
+        return nodeBaseInfoService.getNameRuleByRule(nameRule, Long.parseLong(wbsId));
+    }
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/WbsTreeContractClientImpl.java

@@ -499,10 +499,7 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
         wbsTreeContractController.saveContractNameRule(s,pKeyId,projectId);
     }
 
-    @Override
-    public R getNameRuleByRule(String nameRule, String wbsId) {
-        return wbsTreeContractController.getNameRuleByRule(nameRule,Long.parseLong(wbsId));
-    }
+
 
 
     @Override

blade-service/blade-manager/src/main/java/org/springblade/manager/service/INodeBaseInfoService.java

@@ -46,4 +46,6 @@ public interface INodeBaseInfoService extends BaseService<NodeBaseInfo> {
     Object getNodeBaseInfoByPkeyId(Long pkeyId, Long nodeId, String autoType, String paramName, BigDecimal min, BigDecimal max);
 
 	Map<String,Object> getAllNodeBaseInfoByPkeyId(Long pkeyId,Long nodeId) throws Exception;
+
+	String getNameRuleByRule(String nameRule, Long pkeyId);
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/NodeBaseInfoServiceImpl.java

@@ -452,4 +452,33 @@ public class NodeBaseInfoServiceImpl extends BaseServiceImpl<NodeBaseInfoMapper,
         return map;
     }
 
+    @Override
+    public String getNameRuleByRule(String nameRule, Long pkeyId) {
+        NodeBaseInfo nodeBaseInfo = this.getBaseMapper().selectOne(new QueryWrapper<NodeBaseInfo>().eq("node_id", pkeyId));
+        if(nodeBaseInfo==null){
+            nodeBaseInfo = this.getOrSaveNodeBaseInfo(pkeyId);
+        }
+        String[] codes = nameRule.split("-");
+        Arrays.sort(codes, Comparator.comparingInt(s -> Integer.parseInt(s.substring(1))));
+        StringBuilder result = new StringBuilder();
+        for (int i = 0; i < codes.length; i++) {
+            if(codes[i].equals("C0")){
+                result.append(nodeBaseInfo.getUnit());
+            } else if (codes[i].equals("C1")) {
+                result.append(nodeBaseInfo.getSubUnit());
+            }else if (codes[i].equals("C2")) {
+                result.append(nodeBaseInfo.getDivision());
+            }else if (codes[i].equals("C3")) {
+                result.append(nodeBaseInfo.getSubDivision());
+            }else if (codes[i].equals("C4")) {
+                result.append(nodeBaseInfo.getItem());
+            }else if (codes[i].equals("C5")) {
+                result.append(nodeBaseInfo.getSubItem());
+            }else if (codes[i].equals("C6")) {
+                result.append(nodeBaseInfo.getProcesses());
+            }
+        }
+        return result.toString();
+    }
+
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -117,7 +117,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
     private final WbsFormElementMapper wbsFormElementMapper;
     private final TrialCyAccessoriesClient trialCyAccessoriesClient;
     private final WbsTreeContractStatisticsClient wbsTreeContractStatisticsClient;
-    private final INodeBaseInfoService nodeBaseInfoService;
+
 
 
     @Autowired