Merge branch 'dev' of http://219.151.185.227:3000/zhuwei/bladex into dev

blade-common/src/main/java/org/springblade/common/utils/YiKeYunApiUtils.java

@@ -15,10 +15,12 @@ import java.util.Map;
 @Slf4j
 public class YiKeYunApiUtils {
     private static final String API_YIKEYUN_APPID = "97543277";
+
     private static final String API_YIKEYUN_APPSECRET = "PXd7GE2j";
 
 
 
+
     /**
      * 根据城市adcode获取天气信息, 易客云 api
      * api doc <a href="http://tianqiapi.com/index/doc?version=day"></a>
@@ -109,8 +111,8 @@ public class YiKeYunApiUtils {
                 data.put("windLevel", itemObj.getString("win_speed"));
                 String date = itemObj.getString("date");
                 // 将 yyyy-MM-dd 转化为 yyyy年MM月dd日
-                String dateFormat = date.replace("-", "年");
-                dateFormat = dateFormat.replace("-", "月") + "日";
+                String dateFormat = date.replaceFirst("-", "年");
+                dateFormat = dateFormat.replaceFirst("-", "月") + "日";
                 map.put(dateFormat, data);
             });
 

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

@@ -1688,7 +1688,7 @@ public R<Boolean> copyContractTreeNode(@RequestBody CopyContractTreeNodeVO vo) {
                 if (new Integer("1").equals(nodeOld.getType())) {
                     //新节点的id设置为随机id
                     newData.setId(oldToNewIdMap.containsKey(nodeOld.getId()) ? oldToNewIdMap.get(nodeOld.getId()) : SnowFlakeUtil.getId());
-                    //20250414-lhb-新增
+                    //TODO 20250414-lhb-新增
                     newData.setTreePId(oldToNewIdMap.containsKey(nodeOld.getId()) ? oldToNewIdMap.get(nodeOld.getId()) : SnowFlakeUtil.getId());
                     //新节点设置规划编号
                     newData.setPartitionCode(StringUtils.isNotEmpty(vo.getPartitionCode()) ? vo.getPartitionCode() : null);
@@ -1781,7 +1781,7 @@ public R<Boolean> copyContractTreeNode(@RequestBody CopyContractTreeNodeVO vo) {
 
             }
 
-            //20250414-lhb-新增 添加祖级字段 ancestorsPId
+            //TODO 20250414-lhb-新增 添加祖级字段 ancestorsPId
             List<WbsTreeContract> contractWbsTreeByContractId = wbsTreeContractClient.getContractWbsTreeByContractId(Long.valueOf(needCopyNode.getContractId()));
             contractWbsTreeByContractId.addAll(saveList);
             Map<Long, WbsTreeContract> collect = contractWbsTreeByContractId.stream().collect(Collectors.toMap(WbsTreeContract::getPKeyId, Function.identity()));
@@ -1965,7 +1965,7 @@ public R<Boolean> copyContractTreeNode(@RequestBody CopyContractTreeNodeVO vo) {
                 resultAll.addAll(addNodeList);
                 resultAll.addAll(addTabList);
 
-                //20250414-lhb-新增
+                //TODO 20250414-lhb-新增
                 List<WbsTreeContract> contractWbsTreeByContractId = wbsTreeContractClient.getContractWbsTreeByContractId(Long.valueOf(contractId));
                 contractWbsTreeByContractId.addAll(resultAll);
                 Map<Long, WbsTreeContract> collect = contractWbsTreeByContractId.stream().collect(Collectors.toMap(WbsTreeContract::getPKeyId, Function.identity()));
@@ -2549,7 +2549,7 @@ private void addCopyNodesAndTabsBuildData(List<WbsTreeContract> addNodeList, Lis
 
         //id字段和随机id
         Map<Long, Long> parentIdToId = new HashMap<>();
-        //20250414-lhb-新增 老对象唯一ID 和新对象唯一id
+        //TODO 20250414-lhb-新增 老对象唯一ID 和新对象唯一id
         Map<Long, Long> oldPKeyIdToNewPkeyId = new HashMap<>();
 
         Map<Long, List<WbsTreeContract>> tabMap = needTabs.stream().collect(Collectors.groupingBy(WbsTreeContract::getParentId));
@@ -2581,11 +2581,11 @@ private void addCopyNodesAndTabsBuildData(List<WbsTreeContract> addNodeList, Lis
                     newParentId = needCopyNode.getId();
                     newPId = needCopyNode.getPKeyId();
                 }
-                //20250414-lhb-调整
+                //TODO 20250414-lhb-调整
                 Long pKeyId = SnowFlakeUtil.getId();
                 obj.setPKeyId(pKeyId);
 
-                //20250414-lhb-新增 保存新老id和新id的映射关系
+                //TODO 20250414-lhb-新增 保存新老id和新id的映射关系
                 oldPKeyIdToNewPkeyId.put(node.getPKeyId(),obj.getPKeyId());
 
                 if (ObjectUtil.isNotEmpty(node.getOldId())) {
@@ -3379,7 +3379,7 @@ public R<Boolean> saveContractTreeNode(@RequestBody AddContractTreeNodeVO vo) {
                 WbsTreeContract wbsTreeContract = BeanUtil.copyProperties(half, WbsTreeContract.class);
                 nodeMapContract.put(half.getId().toString(), wbsTreeContract);
 
-                //20250414-lhb-新增  绑定旧keyId和新keyId
+                //TODO 20250414-lhb-新增  绑定旧keyId和新keyId
                 OldPKeyIdToNewPKeyIdMap.put(half.getPKeyId(),SnowFlakeUtil.getId());
 
             });
@@ -3405,12 +3405,14 @@ public R<Boolean> saveContractTreeNode(@RequestBody AddContractTreeNodeVO vo) {
                         WbsTreePrivate wbsTreePrivate = nodeMap.get(half.getParentId() + "");
                         if (treeContract.getNodeType().equals(wbsTreePrivate.getNodeType()) && treeContract.getNodeName().equals(wbsTreePrivate.getNodeName())) {
                             newData.setParentId(treeContract.getId());
+                            //TODO
                             newData.setPId(treeContract.getPKeyId());
                             var = false;
 
                             //从复制or新增节点开始操作-》选择新增节点，根节点会走到这里
                         } else if (treeContract.getNodeType().equals(wbsTreePrivate.getNodeType()) && ObjectUtil.isNotEmpty(treeContract.getOldId()) && treeContract.getOldId().equals(wbsTreePrivate.getId().toString())) {
                             newData.setParentId(treeContract.getId());
+                            //TODO
                             newData.setPId(treeContract.getPKeyId());
                             var = false;
                         }
@@ -3441,6 +3443,15 @@ public R<Boolean> saveContractTreeNode(@RequestBody AddContractTreeNodeVO vo) {
                                 ||
                                 half.getParentId().toString().equals(treeContract.getOldId())
                                 ? treeContract.getId() : SnowFlakeUtil.getId());
+
+                            // TODO  现阶段 odlId为被复制节点的Id字段的值 不能不能拿来做PId的匹配 后面考虑优化
+                            newData.setPId(OldPKeyIdToNewPKeyIdMap.containsKey(half.getPId())
+                                    ? OldPKeyIdToNewPKeyIdMap.get(half.getPId()) : treeContract.getPKeyId().equals(half.getPId())
+                                    ||
+                                    half.getParentId().toString().equals(treeContract.getOldId())
+                                    ? treeContract.getPKeyId() : SnowFlakeUtil.getId());
+
+
                         }
                     }
 
@@ -3542,6 +3553,10 @@ public R<Boolean> saveContractTreeNode(@RequestBody AddContractTreeNodeVO vo) {
                         if (wbsTreeContract.getPKeyId().equals(root.getPKeyId())) { //根节点
                             wbsTreeContract.setParentId(treeContract.getId());
                             wbsTreeContract.setAncestors(treeContract.getAncestors() + "," + wbsTreeContract.getParentId());
+                            //TODO
+                            wbsTreeContract.setPId(treeContract.getPKeyId());
+                            //TODO
+                            wbsTreeContract.setAncestorsPId(treeContract.getAncestorsPId() + "," + wbsTreeContract.getPId());
                             ancestorsMap.put(wbsTreeContract.getId(), wbsTreeContract.getAncestors());
                         }
 
@@ -3568,12 +3583,12 @@ public R<Boolean> saveContractTreeNode(@RequestBody AddContractTreeNodeVO vo) {
             for (WbsTreeContract wbsTreeContract : saveList) {
                 if (topLevelNode.getPKeyId().equals(wbsTreeContract.getPKeyId())) {
                     wbsTreeContract.setParentId(treeContract.getId());
-                    //20250414-lhb-新增
+                    //TODO 20250414-lhb-新增
                     wbsTreeContract.setPId(treeContract.getPKeyId());
                 }
             }
         }
-        //20250414-lhb-新增 添加ancestorsPId字段
+        //TODO 20250414-lhb-新增 添加ancestorsPId字段
         List<WbsTreeContract> contractWbsTreeByContractId = wbsTreeContractClient.getContractWbsTreeByContractId(Long.valueOf(treeContract.getContractId()));
         contractWbsTreeByContractId.addAll(saveList);
         Map<Long, WbsTreeContract> collect = contractWbsTreeByContractId.stream().collect(Collectors.toMap(WbsTreeContract::getPKeyId, Function.identity()));
@@ -4409,7 +4424,7 @@ public R<Object> customAddContractNode(@RequestBody CustomAddContractNodeDTO dto
             obj.setPartitionCode(dto.getPartitionCode());
         }
         obj.setParentId(parentNode.getId());
-        //20250414-lhb-新增
+        //TODO 20250414-lhb-新增
         obj.setPId(parentNode.getPKeyId());
         obj.setAncestors(parentNode.getAncestors() + "," + parentNode.getId());
         obj.setAncestorsPId(parentNode.getAncestorsPId() + "," + parentNode.getPKeyId());

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/WeatherInfoServiceImpl.java

@@ -138,10 +138,11 @@ public class WeatherInfoServiceImpl extends ServiceImpl<WeatherInfoMapper, Weath
                 Map<String, String> weatherMap = cachedWeatherMap.get(area.getCity_code());
                 if (weatherMap == null) {
                     //获取天气信息（百度天气）
-                    weatherMap = YiKeYunApiUtils.getTodayWeatherByAdcode(area.getCity_code());
+                    weatherMap = YiKeYunApiUtils.getTodayWeatherByAdcode(area.getCity_code() + "000000");
                     if (weatherMap == null) {
                         weatherMap = BaiduApiUtil.getTodayWeather(area.getCity_code());
                     }
+                    cachedWeatherMap.put(area.getCity_code(), weatherMap);
                 }
                 if (weatherMap != null) {
                     //计算平均气温

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.xml

@@ -164,7 +164,7 @@
                                         `STATUS`, is_deleted,
                                         unique_code, partition_code, is_expernode, is_concrete, table_owner,
                                         major_data_type, init_table_name, is_link_table, excel_id, html_url,
-                                        is_type_private_pid, is_ele)
+                                        is_type_private_pid, is_ele, tree_p_id, p_id, ancestors_p_id)
         VALUES (#{pKeyId}, #{wbsTree.id}, #{wbsTree.wbsId}, #{wbsType}, #{wbsTree.projectId}, #{contractId}, 1,
                 #{wbsTree.tenantId}, #{wbsTree.parentId}, #{wbsTree.ancestors},
                 #{wbsTree.nodeType}, #{wbsTree.nodeName}, #{wbsTree.fullName}, #{wbsTree.sort}, #{wbsTree.remark},
@@ -174,7 +174,7 @@
                 #{wbsTree.status}, #{wbsTree.isDeleted}, #{wbsTree.uniqueCode}, #{wbsTree.partitionCode},
                 #{wbsTree.isExpernode}, #{wbsTree.isConcrete},
                 #{wbsTree.tableOwner}, #{wbsTree.majorDataType}, #{wbsTree.initTableName}, #{wbsTree.isLinkTable},
-                #{wbsTree.excelId}, #{wbsTree.htmlUrl}, #{wbsTree.pKeyId}, 1)
+                #{wbsTree.excelId}, #{wbsTree.htmlUrl}, #{wbsTree.pKeyId}, 1, #{wbsTree.treePId}, #{wbsTree.pId}, #{wbsTree.ancestorsPId})
     </insert>
 
     <update id="deleteBatch">

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

@@ -1534,6 +1534,14 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
             wbsTreePrivate.setStatus(1);
             wbsTreePrivate.setIsDeleted(0);
             Long pKeyId1 = SnowFlakeUtil.getId();
+
+            //TODO
+            wbsTreePrivate.setTreePId(wbsTreeContract.getId());
+            //TODO
+            wbsTreePrivate.setPId(wbsTreeContract.getPKeyId());
+            //TODO
+            wbsTreePrivate.setAncestorsPId(wbsTreeContract.getAncestorsPId() + "," + wbsTreePrivate.getPId());
+
             this.wbsTreeContractMapper.insertByCondition(wbsTreePrivate, contractId, pKeyId1, 1);
         }
         return R.success("添加成功");

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

@@ -187,6 +187,13 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
             if (parent != null) {
                 String ancestors = parent.getAncestors() + "," + wbsTreePrivate.getParentId();
                 wbsTreePrivate.setAncestors(ancestors);
+
+                //TODO
+                wbsTreePrivate.setTreePId(parent.getId());
+                //TODO
+                wbsTreePrivate.setPId(parent.getPKeyId());
+                //TODO
+                wbsTreePrivate.setAncestorsPId(parent.getAncestorsPId() + "," + parent.getPKeyId());
             }
 
             //初始化sort
@@ -1611,11 +1618,11 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                                 dataPrivate.setProjectId(wbsTreePrivate.getProjectId());
                                 dataPrivate.setFullName(dataPrivate.getNodeName());
                                 dataPrivate.setInitTableId(tree.getInitTableId().toString());
-                                //TODO
-                                dataPrivate.setTreePId(tree.getId());
                                 dataPrivate.setIsAddConceal(0);
                                 dataPrivate.setParentId(wbsTreePrivate.getId());
                                 //TODO
+                                dataPrivate.setTreePId(tree.getId());
+                                //TODO
                                 dataPrivate.setPId(wbsTreePrivate.getPKeyId());
                                 //TODO
                                 dataPrivate.setAncestorsPId(wbsTreePrivate.getAncestorsPId() + "," + dataPrivate.getPId());
@@ -2421,11 +2428,11 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                     pri.setAncestors(aPrivate.getAncestors() + "," + aPrivate.getId());
 
                     //TODO
-                    pri.setTreePId(form.getId());
+                    pri.setTreePId(aPrivate.getId());
                     //TODO
-                    pri.setPId(form.getPKeyId());
+                    pri.setPId(aPrivate.getPKeyId());
                     //TODO
-                    pri.setAncestorsPId(aPrivate.getAncestorsPId() + "," + aPrivate.getPId());
+                    pri.setAncestorsPId(aPrivate.getAncestorsPId() + "," + pri.getPId());
 
                     pri.setNodeType(1);
                     pri.setNodeName(form.getNodeName());
@@ -2474,11 +2481,11 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                     con.setAncestors(contract.getAncestors() + "," + contract.getId());
 
                     //TODO
-                    con.setTreePId(pri.getId());
+                    con.setTreePId(contract.getId());
                     //TODO
                     con.setPId(contract.getPKeyId());
                     //TODO
-                    con.setAncestorsPId(contract.getAncestorsPId() + "," + contract.getPId());
+                    con.setAncestorsPId(contract.getAncestorsPId() + "," + con.getPId());
 
 
                     con.setNodeType(pri.getNodeType());
@@ -2585,7 +2592,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
             //TODO
             wbsTreePrivate.setPId(wbsTreeContract.getPKeyId());
             //TODO
-            wbsTreePrivate.setAncestorsPId(wbsTreeContract.getAncestorsPId() + "," + wbsTreeContract.getPId());
+            wbsTreePrivate.setAncestorsPId(wbsTreeContract.getAncestorsPId() + "," + wbsTreePrivate.getPId());
 
             wbsTreePrivate.setWbsId(wbsTreeContract.getWbsId());
             wbsTreePrivate.setFullName(wbsTreePrivate.getNodeName());