fix(finance-manage): 计费策略重命名

Author: shaohuzhang1

services/finance-management/backend/src/main/java/com/fit2cloud/controller/BillingPolicyController.java

@@ -73,6 +73,16 @@ public ResultHolder<Boolean> removeBillingPolicy(@Parameter(description = "计
         return ResultHolder.success(remove);
     }
 
+    @Operation(description = "重命名策略", summary = "重命名策略")
+    @PutMapping("/re_name/{billing_policy_id}")
+    @PreAuthorize("@cepc.hasAnyCePermission('BILLING_POLICY:EDIT')")
+    public ResultHolder<BillPolicy> rePolicyName(@Parameter(description = "计费策略id") @CustomValidated(mapper = BaseBillPolicyMapper.class, handler = ExistHandler.class, field = "id", message = "计费策略id不存在", exist = false)
+                                                 @PathVariable("billing_policy_id") String billingPolicyId,
+                                                 @Validated @RequestParam("name") String name) {
+        BillPolicy billPolicy = billingPolicyService.reName(billingPolicyId, name);
+        return ResultHolder.success(billPolicy);
+    }
+
     @Operation(summary = "修改策略")
     @PutMapping("/{billing_policy_id}")
     @PreAuthorize("@cepc.hasAnyCePermission('BILLING_POLICY:EDIT')")

services/finance-management/backend/src/main/java/com/fit2cloud/service/IBillingPolicyService.java

@@ -72,4 +72,13 @@ public interface IBillingPolicyService extends IService<BillPolicy> {
      * @return 计价策略详情
      */
     List<BillPolicyDetails> calculateConfigPrice(String cloudAccountId);
+
+    /**
+     * 策略重命名
+     *
+     * @param billingPolicyId 策略id
+     * @param name            策略名称
+     * @return 策略对象
+     */
+    BillPolicy reName(String billingPolicyId, String name);
 }

services/finance-management/backend/src/main/java/com/fit2cloud/service/impl/BillingPolicyServiceImpl.java

@@ -127,17 +127,7 @@ public List<CloudAccountResponse> listCloudAccountByPolicy(String billingPolicy)
     @Transactional
     public void updateBillingPolicy(String billingPolicyId, BillingPolicyRequest request) {
         if (StringUtils.isNotEmpty(request.getName())) {
-            BillPolicy billPolicy = this.getOne(new LambdaQueryWrapper<BillPolicy>()
-                    .ne(BillPolicy::getId, billingPolicyId)
-                    .eq(BillPolicy::getName, request.getName()));
-            if (Objects.isNull(billPolicy)) {
-                BillPolicy newBillPolicy = new BillPolicy();
-                newBillPolicy.setName(request.getName());
-                newBillPolicy.setId(billingPolicyId);
-                updateById(newBillPolicy);
-            } else {
-                throw new Fit2cloudException(222, "策略名称已存在");
-            }
+            reName(billingPolicyId, request.getName());
         }
         LocalDateTime currentTime = LocalDateTime.now();
         updateBillingPolicyDetails(request.getBillingPolicyDetailsList(), billingPolicyId, currentTime);
@@ -253,6 +243,22 @@ public List<BillPolicyDetails> calculateConfigPrice(String cloudAccountId) {
                                 .map(BillPolicyCloudAccountMapping::getBillPolicyId).distinct().toList()));
     }
 
+    @Override
+    public BillPolicy reName(String billingPolicyId, String name) {
+        List<BillPolicy> billPolicyList = this.list(new LambdaQueryWrapper<BillPolicy>()
+                .ne(BillPolicy::getId, billingPolicyId)
+                .eq(BillPolicy::getName, name));
+        if (CollectionUtils.isEmpty((billPolicyList))) {
+            BillPolicy newBillPolicy = new BillPolicy();
+            newBillPolicy.setName(name);
+            newBillPolicy.setId(billingPolicyId);
+            updateById(newBillPolicy);
+            return getById(billingPolicyId);
+        } else {
+            throw new Fit2cloudException(222, "策略名称已存在");
+        }
+    }
+
 
     private List<BillingField> toBillingFieldList(Map<String, BillingFieldMeta> metaMap, Function<BillingFieldMeta, BigDecimal> getDefaultPrice, List<BillingField> oldBillingFieldList, UnitPriceConstants unitPriceConstants) {
         return metaMap

services/finance-management/frontend/src/api/billing_policy/index.ts

@@ -95,9 +95,9 @@ const reName: (
   loading?: Ref<boolean>
 ) => Promise<Result<any>> = (billing_policy_id, name, loading) => {
   return put(
-    `/api/billing_policy/${billing_policy_id}`,
+    `/api/billing_policy/re_name/${billing_policy_id}`,
+    { name },
     {},
-    { name: name },
     loading
   );
 };

services/finance-management/frontend/src/views/billing_policy/components/CloudAccountCheckbox.vue

@@ -167,7 +167,7 @@ const rowCloudAccountList = computed(() => {
       margin-top: 11px;
     }
     &:first-child {
-      margin-top: 0;
+      margin-top: 10px;
       .col {
         margin-top: 0;
       }