量子魔方6.6第二期

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/controller/FundModuleController.java

 package com.quantgroup.asset.distribution.controller;
 
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import com.quantgroup.asset.distribution.model.entity.fund.FundConfigCondition;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -109,6 +112,10 @@ public class FundModuleController {
 		return findChannelFundConfigCommon(configId, 2);
 	}
 
+	@RequestMapping("/simulation/conditions")
+	public GlobalResponse allConditions(Long configId){
+		return fundConfigConditions(configId);
+	}
 
 	private GlobalResponse saveChannelFundsConfigCommon(Integer type, Long id, String bizChannel, String funds, String remarks,
 														String auditor, String proposer, int oldOrNew) {
@@ -182,4 +189,26 @@ public class FundModuleController {
 		log.info("资方模块接口, 根据id获取资方配置, configId : {} 耗时 : {}, response : {}", configId, stopwatch.stop().elapsed(TimeUnit.MILLISECONDS), JSON.toJSONString(response));
 		return response;
 	}
+
+	private GlobalResponse fundConfigConditions(Long configId){
+		log.info("资方模块接口，根据id获取所有案例, configId : {}", configId);
+		if (configId == null) {
+			return GlobalResponse.create(FundModuleResponse.ID_IS_EMPTY);
+		}
+		Stopwatch stopwatch = Stopwatch.createStarted();
+		GlobalResponse response = fundModuleService.getAllConditionsOfFundConfig(configId);
+		log.info("资方模块接口,根据id获取所有案例, configId : {} 耗时 : {}, response : {}", configId, stopwatch.stop().elapsed(TimeUnit.MILLISECONDS), JSON.toJSONString(response));
+		return response;
+	}
+
+	private GlobalResponse simulation(List<FundConfigCondition> configConditions,Long configId){
+		log.info("资方模块接口，根据案例进行空泡, configConditions : {}", configConditions);
+		if (CollectionUtils.isEmpty(configConditions)) {
+			return GlobalResponse.create(FundModuleResponse.ID_IS_EMPTY);
+		}
+		Stopwatch stopwatch = Stopwatch.createStarted();
+		GlobalResponse response = fundModuleService.simulationCases(configConditions,configId);
+		log.info("资方模块接口,根据id获取所有案例, configConditions : {} 耗时 : {}, response : {}", configConditions, stopwatch.stop().elapsed(TimeUnit.MILLISECONDS), JSON.toJSONString(response));
+		return response;
+	}
 }

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/FundConfigCondition.java

+package com.quantgroup.asset.distribution.model.entity.fund;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class FundConfigCondition implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String conditionTempId;
+    private List<Condition> condition;
+    private Result result;
+
+
+    @Data
+    public static class Condition{
+        private String conditionCode;
+        private String conditionName;
+        private String conditionValue;
+    }
+
+    @Data
+    public static class Result{
+        private Boolean success;
+        private String fundInfo;
+    }
+}

src/main/java/com/quantgroup/asset/distribution/service/funding/IFundModuleService.java

 package com.quantgroup.asset.distribution.service.funding;
 
+import com.quantgroup.asset.distribution.config.annotation.HandleException;
+import com.quantgroup.asset.distribution.model.entity.fund.FundConfigCondition;
 import com.quantgroup.asset.distribution.model.response.GlobalResponse;
 
+import java.util.List;
+
 /**
  * 资方模块Service
  * @author liwenbin
@@ -99,4 +103,8 @@ public interface IFundModuleService {
 	 * @return
 	 */
 	public GlobalResponse audit(Long id, Integer auditStatus);
+
+	GlobalResponse getAllConditionsOfFundConfig(Long configId);
+
+	GlobalResponse simulationCases(List<FundConfigCondition> configConditions,Long configId);
 }

src/test/java/com/quantgroup/asset/distribution/niwodai/NiwodaiTest.java

@@ -6,6 +6,9 @@ import cn.quantgroup.user.IUserSdkService;
 import cn.quantgroup.user.UserSdkServiceFactory;
 import com.alibaba.fastjson.JSON;
 import com.quantgroup.asset.distribution.AssetDistributionBootstrap;
+import com.quantgroup.asset.distribution.model.entity.fund.FundConfigCondition;
+import com.quantgroup.asset.distribution.model.entity.fund.FundConfigSimulationVO;
+import com.quantgroup.asset.distribution.service.funding.IFundModuleService;
 import com.quantgroup.asset.distribution.service.niwodai.INiwodaiAssetService;
 import com.quantgroup.asset.distribution.service.niwodai.INiwodaiService;
 import com.quantgroup.asset.distribution.service.niwodai.vo.*;
@@ -21,6 +24,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 import javax.annotation.PostConstruct;
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 
 @RunWith(SpringRunner.class)
@@ -37,6 +41,8 @@ public class NiwodaiTest {
 	@Value("${user.sdk.url}")
 	private String userSysUrl;
 	private IUserSdkService userSdkService;
+	@Autowired
+	private IFundModuleService fundModuleService;
 	@PostConstruct
 	private void init() {
 		userSdkService = UserSdkServiceFactory.generateSDKService(userSysUrl, httpClient);
@@ -63,8 +69,25 @@ public class NiwodaiTest {
 
 	@Test
 	public void testIncoming() {
-		NiwodaiIncomingResponseVO vo = niwodaiAssetService.incoming("ae7d04bf-1c5a-475b-98d2-b193be88cf2f","1028791648161","10000",12);
+		NiwodaiIncomingResponseVO vo = niwodaiAssetService.incoming("2f0c65a8-c94e-4e03-87c6-b0ae99b100f0","AN000000135399103854755840","10000",12);
+		System.out.println(JSON.toJSONString(vo));
+	}
+
+	@Test
+	public void testResult(){
+		NiwodaiIncomingResultResponseVO vo = niwodaiAssetService.incomingResult("AN000000135399103854755840");
 		System.out.println(JSON.toJSONString(vo));
 	}
 
+	@Test
+	public void testFund(){
+		fundModuleService.getAllConditionsOfFundConfig(1L);
+	}
+
+	@Test
+	public void testFundResult(){
+		List<FundConfigCondition> list = ((FundConfigSimulationVO)fundModuleService.getAllConditionsOfFundConfig(7L).getBody()).getConditionsCase();
+		fundModuleService.simulationCases(list,7L);
+	}
+
 }