资料上报节点复制优化

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

@@ -29,7 +29,7 @@ public interface TableFileClient {
     @PostMapping(API_PREFIX + "/saveBatch")
     boolean saveBatch(@RequestBody List<TableFile> newFiles);
 
-    @GetMapping(API_PREFIX + "/getTabFilesByTabIds")
-    List<TableFile> getTabFilesByTabIds(@RequestParam String tabFileIds);
+    @PostMapping(API_PREFIX + "/getTabFilesByTabIds")
+    List<TableFile> getTabFilesByTabIds(@RequestBody List<String> tabFileIds);
 
 }

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

@@ -8,6 +8,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 import static org.springblade.core.launch.constant.AppConstant.APPLICATION_NAME_PREFIX;
 
 @FeignClient(value = APPLICATION_NAME_PREFIX + "manager")
@@ -23,4 +25,6 @@ public interface WbsParamClient {
     @GetMapping(API_PREFIX + "/getWbsParam")
     WbsParam getWbsParam(@RequestParam Long nodeId);
 
+    @PostMapping(API_PREFIX + "/saveWbsParams")
+    void saveWbsParams(@RequestBody List<WbsParam> wbsParamList);
 }

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

@@ -1734,6 +1734,7 @@ public R<Boolean> copyContractTreeNode(@RequestBody CopyContractTreeNodeVO vo) {
 
             /*获取元素表数据*/
             Map<Long, Map<String, Object>> colMaps = new HashMap<>();
+            Map<Long, String> colMap = new HashMap<>();
             //是否需要复制数据
             if (vo.getIsCopyData() == 1) {
                 //表名集合
@@ -1744,7 +1745,7 @@ public R<Boolean> copyContractTreeNode(@RequestBody CopyContractTreeNodeVO vo) {
                         .collect(Collectors.toList());
                 //表名集合转逗号拼接的字符串
                 String inClausePlaceholders = String.join(",", Collections.nCopies(tabNames.size(), "?"));
-                String sql = "SELECT table_name AS queryType, GROUP_CONCAT(COLUMN_name) AS ancestors " +
+                String sql = "SELECT table_name AS queryType, GROUP_CONCAT(distinct COLUMN_name) AS ancestors " +
                         "FROM information_schema.COLUMNS WHERE table_name IN (" + inClausePlaceholders + ") " +
                         "GROUP BY table_name";
                 Object[] params = tabNames.toArray();
@@ -1773,21 +1774,23 @@ public R<Boolean> copyContractTreeNode(@RequestBody CopyContractTreeNodeVO vo) {
                     List<WbsTreeContract> tabs = tabsGroup.get(tabName);
                     for (WbsTreeContract tab : tabs) {
                         //根据字段
-                        String dataSql = "SELECT " + keys + " FROM " + tabName + " WHERE p_key_id = " + tab.getPKeyId() + " LIMIT 1;";
-                        try {
-                            //查询指定表指定表节点的数据
-                            Map<String, Object> resultMap = jdbcTemplate.queryForMap(dataSql);
-                            //删除空值
-                            resultMap.values().removeIf(value -> value == null || (value instanceof String && ObjectUtil.isEmpty(value)));
-                            colMaps.put(tab.getPKeyId(), resultMap);
-                        } catch (EmptyResultDataAccessException e) {
-                            continuePkeyIds.add(tab.getPKeyId());
-                        }
+//                        String dataSql = "SELECT " + keys + " FROM " + tabName + " WHERE p_key_id = " + tab.getPKeyId() + " LIMIT 1;";
+//                        try {
+//                            //查询指定表指定表节点的数据
+//                            Map<String, Object> resultMap = jdbcTemplate.queryForMap(dataSql);
+//                            //删除空值
+//                            resultMap.values().removeIf(value -> value == null || (value instanceof String && ObjectUtil.isEmpty(value)));
+//                            colMaps.put(tab.getPKeyId(), resultMap);
+//                        } catch (EmptyResultDataAccessException e) {
+//                            continuePkeyIds.add(tab.getPKeyId());
+//                        }
+                        colMap.put(tab.getPKeyId(), keys);
                     }
                 }
                 logger.info("以下元素表没有获取到对应实体表数据，已跳过 ===> 表pKeyId：[{}]", StringUtils.join(continuePkeyIds, ","));
             }
             // 节点+表节点
+            List<WbsTreeContract> wbsParamAndLedgerList = new ArrayList<>();
             for (WbsTreeContract nodeOld : nodeChildAll) {
                 //新节点
                 WbsTreeContract newData = new WbsTreeContract();
@@ -1798,15 +1801,18 @@ public R<Boolean> copyContractTreeNode(@RequestBody CopyContractTreeNodeVO vo) {
                 if (nodeOld.getNodeType() != null && nodeOld.getNodeType() == 6) {
                     //新旧节点关联关系
                     peerMap.put(newData.getPKeyId(), nodeOld.getPKeyId());
-                    //复制节点命名配置
-                    //查询节点绑定的公共配置 文件提名信息
-                    WbsParam wbsParam = wbsParamClient.getWbsParam(Long.parseLong(vo.getNeedCopyPrimaryKeyId()));
-                    if(wbsParam!=null){
-                        wbsParam.setId(SnowFlakeUtil.getId());
-                        wbsParam.setNodeId(newData.getPKeyId());
-                        //给复制的节点绑定的公共配置
-                        wbsParamClient.saveWbsParam(wbsParam);
-                    }
+//                    //复制节点命名配置
+//                    //查询节点绑定的公共配置 文件提名信息
+//                    WbsParam wbsParam = wbsParamClient.getWbsParam(Long.parseLong(vo.getNeedCopyPrimaryKeyId()));
+//                    if(wbsParam!=null){
+//                        wbsParam.setId(SnowFlakeUtil.getId());
+//                        wbsParam.setNodeId(newData.getPKeyId());
+//                        //给复制的节点绑定的公共配置
+//                        wbsParamClient.saveWbsParam(wbsParam);
+//                    }
+//                    /*生成工序节点施工日志*/
+//                    this.createLedger(newData, saveLedger, nodeMap, null);
+                    wbsParamAndLedgerList.add(newData);
                 }
                 //源节点是否为复制节点 如果是则设置源节点的源节点 如何不是设置源节点id
                 if (StringUtils.isNotEmpty(nodeOld.getOldId())) {
@@ -1851,9 +1857,9 @@ public R<Boolean> copyContractTreeNode(@RequestBody CopyContractTreeNodeVO vo) {
                 saveList.add(newData);
 
                 /*生成工序节点施工日志*/
-                if (new Integer("6").equals(nodeOld.getNodeType())) {
-                    this.createLedger(newData, saveLedger, nodeMap, null);
-                }
+//                if (new Integer("6").equals(nodeOld.getNodeType())) {
+//                    this.createLedger(newData, saveLedger, nodeMap, null);
+//                }
 
                 /*处理复制表数据*/
                 if (nodeOld.getType() == 2 && vo.getIsCopyData() == 1
@@ -1861,54 +1867,84 @@ public R<Boolean> copyContractTreeNode(@RequestBody CopyContractTreeNodeVO vo) {
                         && tabOwner.contains(nodeOld.getTableOwner())) {
 
                     /*获取表对应的实体数据*/
-                    Map<String, Object> resultMap = colMaps.getOrDefault(nodeOld.getPKeyId(), null);
-                    if (resultMap == null) {
+//                    Map<String, Object> resultMap = colMaps.getOrDefault(nodeOld.getPKeyId(), null);
+//                    if (resultMap == null) {
+//                        continue;
+//                    }
+                    String keys = colMap.getOrDefault(nodeOld.getPKeyId(), null);
+                    if (keys == null || keys.isEmpty()) {
                         continue;
                     }
-
                     /*重置*/
-                    Map<String, String> eMap = reviseValue(nodeOld, null, ekvMap);
+//                    Map<String, String> eMap = reviseValue(nodeOld, null, ekvMap);
 
                     /*构造复制表数据*/
-                    StringBuilder newString = new StringBuilder();
-                    List<String> keySet = new LinkedList<>();
-                    for (Map.Entry<String, Object> entry : resultMap.entrySet()) {
-                        keySet.add(entry.getKey());
-                        Object value = reviseValue(eMap, entry.getKey(), entry.getValue());
-                        if (value != null) {
-                            if (value.toString().contains("\n")) {
-                                value = value.toString().replace("\n", "\\n");
-                            }
-                            newString.append("'").append(value).append("',");
-                        }
-                    }
-                    if (newString.length() > 0) {
-                        newString.insert(0, ',');
-                        if (newString.charAt(newString.length() - 1) == ',') {
-                            newString.deleteCharAt(newString.length() - 1);
-                        }
-                    }
-                    String keysHaveValue = StringUtils.join(keySet, ",");
-                    if (keysHaveValue.length() > 0) {
-                        keysHaveValue = "," + keysHaveValue;
-                    }
+//                    StringBuilder newString = new StringBuilder();
+//                    List<String> keySet = new LinkedList<>();
+//                    for (Map.Entry<String, Object> entry : resultMap.entrySet()) {
+//                        keySet.add(entry.getKey());
+//                        Object value = reviseValue(eMap, entry.getKey(), entry.getValue());
+//                        if (value != null) {
+//                            if (value.toString().contains("\n")) {
+//                                value = value.toString().replace("\n", "\\n");
+//                            }
+//                            newString.append("'").append(value).append("',");
+//                        }
+//                    }
+//                    if (newString.length() > 0) {
+//                        newString.insert(0, ',');
+//                        if (newString.charAt(newString.length() - 1) == ',') {
+//                            newString.deleteCharAt(newString.length() - 1);
+//                        }
+//                    }
+//                    String keysHaveValue = StringUtils.join(keySet, ",");
+//                    if (keysHaveValue.length() > 0) {
+//                        keysHaveValue = "," + keysHaveValue;
+//                    }
                     //delete SQL (先删除旧数据，再新增)
                     String delSql = "DELETE FROM " + newData.getInitTableName() + " WHERE p_key_id = " + newData.getPKeyId() + " ; ";
                     //insert SQL
+//                    copySql.append(delSql)
+//                            .append("INSERT INTO ")
+//                            .append(newData.getInitTableName())
+//                            .append(" (id,p_key_id,group_id")
+//                            .append(keysHaveValue)
+//                            .append(") VALUES (")
+//                            .append(SnowFlakeUtil.getId()).append(",")
+//                            .append(newData.getPKeyId()).append(",null")
+//                            .append(newString)
+//                            .append(");");
                     copySql.append(delSql)
                             .append("INSERT INTO ")
                             .append(newData.getInitTableName())
-                            .append(" (id,p_key_id,group_id")
-                            .append(keysHaveValue)
-                            .append(") VALUES (")
+                            .append(" (id,p_key_id,group_id,")
+                            .append(keys).append(") select ")
                             .append(SnowFlakeUtil.getId()).append(",")
-                            .append(newData.getPKeyId()).append(",null")
-                            .append(newString)
-                            .append(");");
+                            .append(newData.getPKeyId()).append(",null, ")
+                            .append(keys).append(" from ").append(newData.getInitTableName()).append(" where p_key_id =").append(nodeOld.getPKeyId()).append(" LIMIT 1;");
                 }
 
 
 
+            }
+            if (!wbsParamAndLedgerList.isEmpty()) {
+                //复制节点命名配置
+                //查询节点绑定的公共配置 文件提名信息
+                WbsParam wbsParam = wbsParamClient.getWbsParam(Long.parseLong(vo.getNeedCopyPrimaryKeyId()));
+                List<WbsParam> wbsParamList = new ArrayList<>();
+                wbsParamAndLedgerList.forEach(newData -> {
+                    if(wbsParam!=null){
+                        WbsParam wbsParam1 = new WbsParam();
+                        BeanUtil.copy(wbsParam, wbsParam1);
+                        wbsParam1.setId(SnowFlakeUtil.getId());
+                        wbsParam1.setNodeId(newData.getPKeyId());
+                        //给复制的节点绑定的公共配置
+                        wbsParamList.add(wbsParam1);
+                    }
+                    /*生成工序节点施工日志*/
+                    this.createLedger(newData, saveLedger, nodeMap, null);
+                });
+                wbsParamClient.saveWbsParams(wbsParamList);
             }
 
             //TODO 20250414-lhb-新增 添加祖级字段 ancestorsPId
@@ -2237,7 +2273,7 @@ private Map<String, String> reviseValue(WbsTreeContract wtc, WbsTreeContract par
             if (!ekvMap.containsKey(tableName)) {
                 Map<String, String> map = ekvMap.computeIfAbsent(wtc.getInitTableName(), K -> new HashMap<>());
                 if (parent == null) {
-                    parent = this.wbsTreeContractClient.getContractWbsTreeByContractIdAndId(wtc.getParentId(), Long.parseLong(wtc.getContractId()));
+                    parent = this.wbsTreeContractClient.getContractWbsTreeByPrimaryKeyId(wtc.getPId());
                 }
                 /*凡是关联了节点参数公式的元素都不复制数据*/
                 List<Map<String, Object>> paramKey = this.jdbcTemplate.queryForList("select DISTINCT b.e_key ek from m_table_info a  join m_wbs_form_element b on a.id=b.f_id  join m_element_formula_mapping c on b.id = c.element_id where a.tab_en_name='" + tableName + "' and b.is_deleted=0 and c.scope=35 and c.is_deleted=0");
@@ -2395,8 +2431,8 @@ private List<WbsTreeContract> reBuildAncestors(List<WbsTreeContract> list) {
 public void addCopyTabFile(Set<WbsTreeContract> addChildNodesTables,
                            Set<WbsTreeContract> addChildNodesTablesOld) {
     //获取所有数据源附件文件
-    List<Long> tabFileIds = addChildNodesTablesOld.stream().distinct().map(WbsTreeContract::getPKeyId).collect(Collectors.toList());
-    Map<String, List<TableFile>> tableFileOldMap = tableFileClient.getTabFilesByTabIds(StringUtils.join(tabFileIds, ",")).stream().collect(Collectors.groupingBy(TableFile::getTabId));
+    List<String> tabFileIds = addChildNodesTablesOld.stream().distinct().map(item -> item.getPKeyId() + "").collect(Collectors.toList());
+    Map<String, List<TableFile>> tableFileOldMap = tableFileClient.getTabFilesByTabIds(tabFileIds).stream().collect(Collectors.groupingBy(TableFile::getTabId));
     if (tableFileOldMap != null && tableFileOldMap.size() > 0) {
         List<TableFile> resultFileData = new ArrayList<>();
         Set<Long> updatePKeyIds = new HashSet<>();
@@ -2688,7 +2724,7 @@ private void addCopyNodesAndTabsBuildData(List<WbsTreeContract> addNodeList, Lis
         List<String> initTabNames = needTabs.stream().map(WbsTreeContract::getInitTableName).distinct().filter(ObjectUtil::isNotEmpty).collect(Collectors.toList());
         String joined = StringUtils.join(initTabNames, ",");
         joined = "'" + joined.replaceAll(",", "','") + "'";
-        Map<String, QueryProcessDataVO> tabColsAllByTabNameMaps = jdbcTemplate.query("SELECT table_name as queryType, GROUP_CONCAT(COLUMN_name) as ancestors from information_schema.COLUMNS where table_name in (" + joined + ") GROUP BY table_name", new BeanPropertyRowMapper<>(QueryProcessDataVO.class)).stream().collect(Collectors.toMap(QueryProcessDataVO::getQueryType, Function.identity()));
+        Map<String, QueryProcessDataVO> tabColsAllByTabNameMaps = jdbcTemplate.query("SELECT table_name as queryType, GROUP_CONCAT(DISTINCT COLUMN_name) as ancestors from information_schema.COLUMNS where table_name in (" + joined + ") GROUP BY table_name", new BeanPropertyRowMapper<>(QueryProcessDataVO.class)).stream().collect(Collectors.toMap(QueryProcessDataVO::getQueryType, Function.identity()));
         for (WbsTreeContract node : needNodes) {
             Long oldId = node.getId();
             //新节点

blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.xml

@@ -923,7 +923,7 @@
 
     <!--获取当前节点下,所有表单的字段数据-->
     <select id="getNodeChildTabColsAllByTabName" resultMap="queryProcessDataMap">
-        SELECT table_name as queryType, GROUP_CONCAT(COLUMN_name) as ancestors
+        SELECT table_name as queryType, GROUP_CONCAT(distinct COLUMN_name) as ancestors
         from information_schema.COLUMNS
         where table_name
                   in (#{tabName})

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

@@ -1670,7 +1670,7 @@ public class ExcelTabController extends BladeController {
         String tabName = wbsTreeContract.getInitTableName();
         // 字段查询 并去掉公式字段
 
-        String colkeys = "SELECT GROUP_CONCAT(COLUMN_NAME) as colkeys from information_schema.COLUMNS c where c.table_name='" + tabName + "' and COLUMN_NAME not in('id','p_key_id')";
+        String colkeys = "SELECT GROUP_CONCAT(distinct COLUMN_NAME) as colkeys from information_schema.COLUMNS c where c.table_name='" + tabName + "' and COLUMN_NAME not in('id','p_key_id')";
         Map<String, Object> stringObjectMap = jdbcTemplate.queryForMap(colkeys);
         colkeys = stringObjectMap.get("colkeys") + "";
         // 复制表数据

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

@@ -36,9 +36,9 @@ public class TableFileClientImpl implements TableFileClient {
     }
 
     @Override
-    public List<TableFile> getTabFilesByTabIds(String tabFileIds) {
+    public List<TableFile> getTabFilesByTabIds(List<String> tabFileIds) {
         return tableFileService.getBaseMapper().selectList(Wrappers.<TableFile>lambdaQuery()
-                .in(TableFile::getTabId, Func.toLongList(tabFileIds))
+                .in(TableFile::getTabId, tabFileIds)
                 .ne(TableFile::getType, 1) //排除源文件
                 .isNotNull(TableFile::getTabId)
         );

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

@@ -6,6 +6,8 @@ import org.springblade.manager.entity.WbsParam;
 import org.springblade.manager.service.IWbsParamService;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @AllArgsConstructor
 public class WbsParamClientImpl implements WbsParamClient{
@@ -21,4 +23,9 @@ public class WbsParamClientImpl implements WbsParamClient{
     public WbsParam getWbsParam(Long nodeId) {
         return iWbsParamService.getBaseMapper().selectOne(Wrappers.lambdaQuery(WbsParam.class).eq(WbsParam::getNodeId, nodeId).eq(WbsParam::getType, 200).eq(WbsParam::getIsDeleted, 0).eq(WbsParam::getK,"FILE_TITLE"));
     }
+
+    @Override
+    public void saveWbsParams(List<WbsParam> wbsParamList) {
+        iWbsParamService.saveBatch(wbsParamList);
+    }
 }