Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-contract/src/main/resources/bootstrap.yml

@@ -5,8 +5,8 @@ spring:
   application:
     name: sckw-contract
   profiles:
-    active:  @profiles.active@
-#    active:  dev
+#    active:  @profiles.active@
+    active:  lfdc
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteSystemServiceImpl.java

@@ -667,7 +667,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
      */
     private List<SysDictGroupResDto> getChild(Long id, List<SysDict> list) {
         if (Objects.isNull(id) || CollectionUtils.isEmpty(list)) {
-            return Collections.emptyList();
+            return null;
         }
         List<SysDictGroupResDto> child = new ArrayList<>();
         for (SysDict sysDict : list) {
@@ -683,7 +683,8 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
                 sysDictGroupResDto.setChild(getChild(sysDictGroupResDto.getId(), list));
             }
         }
-        return child;
+
+        return CollectionUtils.isEmpty(child) ? null : child;
     }
 
 

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsMenuService.java

@@ -420,6 +420,13 @@ public class KwsMenuService {
             return list;
         }
 
+        List<Long> longs = childList.stream().map(KwsMenu::getId).toList();
+        for (KwsMenu kwsMenu : menuList) {
+            if (!longs.contains(kwsMenu.getId())) {
+                list.add(kwsMenu.getId());
+            }
+        }
+
         list.addAll(childList.stream().map(KwsMenu::getId).toList());
         return getAllMenus(childList.stream().map(KwsMenu::getParentId).collect(Collectors.toList()), list);
     }

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsRoleService.java

@@ -377,7 +377,9 @@ public class KwsRoleService {
         if (CollectionUtils.isNotEmpty(kwsMenuRights)) {
             List<Long> menuIdList = kwsMenuRights.stream().map(KwsMenuRights::getMenuId).toList();
             List<KwsMenu> kwsMenus = kwsMenuDao.selectByKeys(menuIdList);
-            List<Long> collect = kwsMenus.stream().filter(item -> item.getType().equals(MenuTypeEnum.BUTTON.getCode())).map(KwsMenu::getId).toList();
+            List<Long> longs = kwsMenus.stream().map(KwsMenu::getParentId).toList();
+            //获取最后一级的菜单或者按钮
+            List<Long> collect = kwsMenus.stream().map(KwsMenu::getId).filter(id -> !longs.contains(id)).toList();
             kwsMenuRights = kwsMenuRights.stream().filter(item -> collect.contains(item.getMenuId())).toList();
             Map<Long, List<KwsMenuRights>> collectKwsMenuRights = kwsMenuRights.stream().collect(Collectors.groupingBy(KwsMenuRights::getRoleId));
             roleResVos.forEach(item -> {

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/AcceptCarriageOrderService.java

@@ -305,11 +305,11 @@ public class AcceptCarriageOrderService {
         carriageUnit.setTopEntId(consignentMap == null ? null : consignentMap.getId());
 
 //        commonService.initIatingLogisticsConsignment(checkUnit, carriageUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId());
-        commonService.newSendLogisticsOrderToMessage(checkUnit, carriageUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
+        commonService.newSendLogisticsOrderToMessage(carriageUnit,checkUnit,  logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
                 messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),
                 messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(),
-                MessageEnum.NEW_CARRIAGE_ORDER,MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT,
-                "1");
+                MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT,MessageEnum.NEW_CARRIAGE_ORDER,
+                "2");
 
         //修改父级mongodb数据
         //更新mongodb

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/CommonService.java

@@ -276,8 +276,8 @@ public class CommonService {
             sendLogisticsCarriageMessage(carriageUnit, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
             sendLogisticsConsignMessage(consignUnit, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
         } else {
-            sendLogisticsConsignMessage(consignUnit, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
-            sendLogisticsCarriageMessage(carriageUnit, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
+            sendLogisticsCarriageMessage(consignUnit, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
+            sendLogisticsConsignMessage(carriageUnit, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
             if (type.equals("1")) {
                 sendLogisticsCreateByMessage(createBy, entId, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
             } else {
@@ -338,6 +338,7 @@ public class CommonService {
                 .setUserInfos(userInfoList)
                 .setCreateBy(LoginUserHolder.getUserId());
         log.info("发起物流托运-[贸易订单物流托运确认/承运订单分包托运确认]-[承运方]-业务联系人：{}", JSON.toJSONString(sckwMessage));
+        log.info("[承运方]-companyName：{}-消息：{}", carriageUnit.getFirmName(),messageEnum.getContent());
         streamBridge.send("sckw-message", JSON.toJSONString(sckwMessage));
     }
 
@@ -367,6 +368,7 @@ public class CommonService {
                 .setUserInfos(list)
                 .setCreateBy(LoginUserHolder.getUserId());
         log.info("发起物流托运-[贸易订单物流托运确认/承运订单分包托运确认]-[托运方]-业务联系人：{}", JSON.toJSONString(message));
+        log.info("[托运方]-companyName：{}-消息：{}", consignUnit.getFirmName(),messageEnum.getContent());
         streamBridge.send("sckw-message", JSON.toJSONString(message));
     }