路径新增、修改接口优化

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/vo/req/AddLineFreightRateParam.java

@@ -32,12 +32,18 @@ public class AddLineFreightRateParam {
     @NotBlank(message = "路径起始位置不能为空")
     private String loadName;
 
+    @NotNull(message = "起始位置所属企业不能为空")
+    private Long loadEntId;
+
     /**
      * 目的地-地址名称
      */
     @NotBlank(message = "路径结束位置不能为空")
     private String unloadName;
 
+    @NotNull(message = "结束位置所属企业不能为空")
+    private Long unloadEntId;
+
     /**
      * 行驶里程/公里
      */

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/vo/req/UpdateLineFreightRateParam.java

@@ -40,12 +40,18 @@ public class UpdateLineFreightRateParam {
     @NotBlank(message = "路径起始位置不能为空")
     private String loadName;
 
+    @NotNull(message = "起始位置所属企业不能为空")
+    private Long loadEntId;
+
     /**
      * 目的地-地址名称
      */
     @NotBlank(message = "路径结束位置不能为空")
     private String unloadName;
 
+    @NotNull(message = "结束位置所属企业不能为空")
+    private Long unloadEntId;
+
     /**
      * 行驶里程/公里
      */

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmLineFreightRateService.java

@@ -62,11 +62,11 @@ public class KwmLineFreightRateService {
         if (Objects.equals(loadName, unloadName)) {
             throw new BusinessException("路径起始结束位置不能相同！");
         }
-        KwmAddress load = addressService.getByNameAndEntId(loadName, entId);
+        KwmAddress load = addressService.getByNameAndEntId(loadName, addLineFreightRateParam.getLoadEntId());
         if (Objects.isNull(load)) {
             throw new BusinessException("路径起始位置信息不存在！");
         }
-        KwmAddress unload = addressService.getByNameAndEntId(unloadName, entId);
+        KwmAddress unload = addressService.getByNameAndEntId(unloadName, addLineFreightRateParam.getUnloadEntId());
         if (Objects.isNull(unload)) {
             throw new BusinessException("路径结束位置信息不存在！");
         }
@@ -104,7 +104,7 @@ public class KwmLineFreightRateService {
             throw new BusinessException("路径起始结束位置不能相同！");
         }
         if (!Objects.equals(loadName, lineFreightRate.getLoadName())) {
-            KwmAddress load = addressService.getByNameAndEntId(param.getLoadName(), entId);
+            KwmAddress load = addressService.getByNameAndEntId(param.getLoadName(), param.getLoadEntId());
             if (Objects.isNull(load)) {
                 throw new BusinessException("路径起始位置信息不存在！");
             }
@@ -113,7 +113,7 @@ public class KwmLineFreightRateService {
                     .setLoadLng(load.getLng()).setLoadLat(load.getLat());
         }
         if (!Objects.equals(unloadName, lineFreightRate.getUnloadName())) {
-            KwmAddress unload = addressService.getByNameAndEntId(param.getUnloadName(), entId);
+            KwmAddress unload = addressService.getByNameAndEntId(param.getUnloadName(), param.getUnloadEntId());
             if (Objects.isNull(unload)) {
                 throw new BusinessException("路径结束位置信息不存在！");
             }