ソースを参照

提交查询固定企业

chenxiaofei 14 時間 前
コミット
5dd16f1b45

+ 1 - 5
sckw-gateway/src/main/java/com/sckw/gateway/utils/GatewayExceptionUtil.java

@@ -21,11 +21,7 @@ public class GatewayExceptionUtil {
 
         log.error("网关服务不可用异常: 路径={}, 方法={}, 异常信息={}", path, method, throwable.getMessage());
 
-        // 【新增】:如果是业务异常,直接提取里面的 code 和 message 透传给前端
-        if (throwable instanceof BusinessPlatfromException) {
-            BusinessPlatfromException bizEx = (BusinessPlatfromException) throwable;
-            return HttpResult.error(bizEx.getErrorCode(), bizEx.getErrorMsg());
-        }
+
         // 根据异常类型返回不同的错误信息
         if (throwable instanceof org.springframework.cloud.gateway.support.NotFoundException) {
             return HttpResult.error(60500, "目标服务不存在或未启动");

+ 4 - 3
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/ParkingChangeStrategyController.java

@@ -89,9 +89,9 @@ public class ParkingChangeStrategyController {
      */
     @Operation(summary = "保存单位分配", description = "保存单位分配")
     @PostMapping("/saveChangeStrategyEnt")
-    public BaseResult saveChangeStrategyEnt(@RequestBody @Valid ParkingChangeStrategyUnitSaveParam param){
-        parkingChangeStrategyService.saveChangeStrategyEnt(param);
-        return BaseResult.success();
+    public BaseResult<ParkingChangeStrategyUnitSaveResp> saveChangeStrategyEnt(@RequestBody @Valid ParkingChangeStrategyUnitSaveParam param){
+        ParkingChangeStrategyUnitSaveResp unitSaveResp = parkingChangeStrategyService.saveChangeStrategyEnt(param);
+        return BaseResult.success(unitSaveResp);
     }
 
 
@@ -121,4 +121,5 @@ public class ParkingChangeStrategyController {
         return BaseResult.success();
     }
 
+
 }

+ 46 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/ParkingChangeStrategyUnitSaveResp.java

@@ -0,0 +1,46 @@
+package com.sckw.transport.model.param;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author :chenXiaoFei
+ * @version :1.0
+ * @description : 保存收费策略分配单位
+ * @create :2025-11-11 20:16:00
+ */
+@Data
+public class ParkingChangeStrategyUnitSaveResp implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -6153312023002477484L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 策略id
+     */
+    private Long strategyId;
+
+
+    /**
+     * 企业名称
+     */
+    private String entNames;
+
+    /**
+     * 异常提示
+     */
+    private String errorCode;
+
+    /**
+     * 异常提示
+     */
+    private String errorMsg;
+
+}

+ 8 - 4
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/ParkingChangeStrategyService.java

@@ -221,13 +221,13 @@ public class ParkingChangeStrategyService {
      * 保存单位分配
      * @param param
      */
-    public void saveChangeStrategyEnt(ParkingChangeStrategyUnitSaveParam param) {
+    public ParkingChangeStrategyUnitSaveResp saveChangeStrategyEnt(ParkingChangeStrategyUnitSaveParam param) {
         log.info("保存单位分配,param:{}", JSON.toJSONString(param));
-
+        ParkingChangeStrategyUnitSaveResp resp = new ParkingChangeStrategyUnitSaveResp();
         // 清空逻辑
         if (CollectionUtils.isEmpty(param.getEntIds())) {
             parkingChangeStrategyUnitRepository.deleteByStrategyId(param.getStrategyId());
-            return;
+            return resp;
         }
 
         // 校验冲突
@@ -237,7 +237,10 @@ public class ParkingChangeStrategyService {
                     .map(KwtParkingChargeStrategyUnit::getEntId)
                     .collect(Collectors.toSet());
             String conflictNames = conflictIds.stream().map(this::getEntName).collect(Collectors.joining(","));
-            throw new BusinessPlatfromException(ErrorCodeEnum.DATA_SAVE_FAIL, conflictNames + "已存在策略, 是否确认替换?");
+            resp.setEntNames(conflictNames);
+            resp.setErrorCode(ErrorCodeEnum.DATA_SAVE_FAIL.getCode());
+            resp.setErrorMsg(conflictNames + "已存在策略, 是否确认替换?");
+            return resp;
         }
 
         // 如果是强制模式,先清理掉旧的关联关系(替换)
@@ -262,6 +265,7 @@ public class ParkingChangeStrategyService {
 
         // 批量插入
         parkingChangeStrategyUnitRepository.saveBatch(insertList);
+        return resp;
     }
 
     /**