量子魔方6.6-2

src/main/java/com/quantgroup/asset/distribution/config/datasource/DataSourceConfig.java

@@ -21,12 +21,9 @@ import com.alibaba.druid.pool.DruidDataSource;
 @Configuration
 public class DataSourceConfig {
 	
-	@Value("${spring.datasource.primary.url}")  
-    private String dbUrl;  
-    @Value("${spring.datasource.primary.username}")  
-    private String username;  
-    @Value("${spring.datasource.primary.password}")  
-    private String password;  
+    private String dbUrl = "jdbc:mysql://172.17.5.9:31024/asset_distribution?useUnicode=true&characterEncoding=utf-8";
+    private String username = "qa";
+    private String password = "qatest";
     @Value("${spring.datasource.primary.driver-class-name}")  
     private String driverClassName;  
       

src/main/java/com/quantgroup/asset/distribution/enums/RuleOperator.java

@@ -43,4 +43,8 @@ public enum RuleOperator {
         log.error("枚举不存在,code={}", code);
         throw new QGException(QGExceptionType.COMMON_ILLEGAL_PARAM);
     }
+
+    public String getCode() {
+        return this.code;
+    }
 }

src/main/java/com/quantgroup/asset/distribution/model/entity/fund/FundConfigSimulationVO.java

+package com.quantgroup.asset.distribution.model.entity.fund;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class FundConfigSimulationVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private List<FundConfigCondition> conditionsCase;
+
+    private List<FundConfigCondition.Condition> conditionsType;
+}