分配比率不足100提醒

ad-platform-pojo/src/main/java/com/baiye/model/enums/ResponseCode.java

@@ -37,7 +37,9 @@ public enum ResponseCode {
      */
     WRONG_USER_NAME_PASSWORD("1016", "用户名或密码不正确"),
 
-    DECRYPTION_FAILED("1012", "数据解析失败");
+    DECRYPTION_FAILED("1012", "数据解析失败"),
+
+    RATIO_FAILED("1013", "比率不足100%,无法分配");
 
 
     private final String code;

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java

@@ -23,7 +23,6 @@ import com.baiye.util.*;
 import com.google.common.collect.Lists;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -279,7 +278,11 @@ public class OrganizeServiceImpl implements OrganizeService {
         List<DistributeResponseDTO> data;
         distributeDTO.setWeights(weights);
         distributeDTO.setIsWeight(true);
-        data = assignDataClient.dataDistribution(distributeDTO).getData();
+        CommonResponse<List<DistributeResponseDTO>> commonResponse = assignDataClient.dataDistribution(distributeDTO);
+        if (commonResponse.getStatus() == 1){
+            throw new BadRequestException( commonResponse.getMsg());
+        }
+        data = commonResponse.getData();
         // 线索更新
         if (data != null && data.size() > 0) {
             int index = 0;

services/ad-platform-service/src/main/java/com/baiye/service/AssignDataService.java

@@ -67,7 +67,8 @@ public class AssignDataService {
         // 集合求和
         double sum = weights.stream().mapToDouble(Double::doubleValue).sum();
         if (sum != DefaultNumberConstants.ONE_HUNDRED) {
-            return CommonResponse.createByErrorMessage(ResponseCode.DECRYPTION_FAILED.getDesc());
+            log.error(" ============= allocation ratio error rate {} ========== ", sum);
+            return CommonResponse.createByErrorMessage(ResponseCode.RATIO_FAILED.getDesc());
         }
         // 进行排序保证最大比例在后
         Map<Long, Double> deptMap =

services/ad-platform-source/src/main/resources/application.yml

@@ -6,7 +6,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: prod
+    active: dev
   application:
     name: @artifactId@
   jackson: