测试框架

ajb-car-api/.classpath

@@ -33,5 +33,6 @@
 			<attribute name="optional" value="true"/>
 			<attribute name="optional" value="true"/>
 		</attributes>
 		</attributes>
 	</classpathentry>
 	</classpathentry>
+	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
 </classpath>

ajb-car-api/pom.xml

@@ -119,12 +119,21 @@
 			<version>0.6.0</version> 
 			<version>0.6.0</version> 
 		</dependency>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/junit/junit -->
 		<!-- https://mvnrepository.com/artifact/junit/junit -->
-		<dependency>
-		    <groupId>junit</groupId>
-		    <artifactId>junit</artifactId>
-		    <version>4.7</version>
-		    <scope>test</scope>
-		</dependency>
+	    <dependency>
+	      <groupId>org.springframework.boot</groupId>
+	      <artifactId>spring-boot-starter-test</artifactId>
+	      <version> 1.5.1.RELEASE</version>
+	    </dependency>
+	    <dependency>
+	      <groupId>org.springframework</groupId>
+	      <artifactId>spring-test</artifactId>
+	      <version>4.3.6.RELEASE</version>
+	    </dependency>
+	    <dependency>
+	      <groupId>junit</groupId>
+	      <artifactId>junit</artifactId>
+	      <version> 4.12</version>
+	    </dependency>
 		
 		
 	</dependencies>
 	</dependencies>
 	<!-- 打包spring boot应用 -->
 	<!-- 打包spring boot应用 -->

ajb-car-api/src/main/java/com/ajb/web/MetaDataController.java

@@ -41,7 +41,7 @@ public class MetaDataController {
 	 * @return
 	 * @return
 	 * @throws Exception
 	 * @throws Exception
 	 */
 	 */
-	@RequestMapping(value="/querybrand/{keyword}",method = RequestMethod.GET)
+	@RequestMapping(value="/querybrandmodellist/{keyword}",method = RequestMethod.GET)
 	public Object queryBrand(@PathVariable String keyword) throws Exception{				
 	public Object queryBrand(@PathVariable String keyword) throws Exception{				
 		//ProvinceResponse quotationResponse = new ProvinceResponse();
 		//ProvinceResponse quotationResponse = new ProvinceResponse();
 		//TODO 
 		//TODO 

ajb-car-api/src/main/java/com/ajb/web/zhima/impl/ZhimaDataSyncServiceImpl.java

@@ -156,11 +156,11 @@ public class ZhimaDataSyncServiceImpl implements ZhimaDataSyncService{
 			vsltax = vsltax.add(BigDecimal.valueOf(list.get(i).getVsltax()));
 			vsltax = vsltax.add(BigDecimal.valueOf(list.get(i).getVsltax()));
 			allCharge = allCharge.add(BigDecimal.valueOf(list.get(i).getAllCharge()));
 			allCharge = allCharge.add(BigDecimal.valueOf(list.get(i).getAllCharge()));
 			
 			
-			System.out.print("getTotalPremium," + list.get(i).getTotalPremium());
-			System.out.print("getBzPremium," + list.get(i).getBzPremium());
-			System.out.print("getTcPremium," + list.get(i).getTcPremium());
-			System.out.print("getVsltax," + list.get(i).getVsltax());
-			System.out.println("getAllCharge," + list.get(i).getAllCharge());
+			System.out.print(",getTotalPremium," + list.get(i).getTotalPremium());
+			System.out.print(",getBzPremium," + list.get(i).getBzPremium());
+			System.out.print(",getTcPremium," + list.get(i).getTcPremium());
+			System.out.print(",getVsltax," + list.get(i).getVsltax());
+			//System.out.println(",getAllCharge," + list.get(i).getAllCharge());
 
 
 			//检查是否已经存在
 			//检查是否已经存在
 			AgPoQuotation one = agPoQuotationService.findByQuoteNo(policyCode);
 			AgPoQuotation one = agPoQuotationService.findByQuoteNo(policyCode);

ajb-car-entity/src/main/java/com/ajb/car/entity/quotation/AgPoQuotationVehicle.java

@@ -310,7 +310,7 @@ private static final long serialVersionUID = 1L;
 	}
 	}
 	/** ?? 发动机号,???? ag_po_quotation_vehicle.engine_no */
 	/** ?? 发动机号,???? ag_po_quotation_vehicle.engine_no */
 	@Column(name="engine_no")
 	@Column(name="engine_no")
-	@Convert(converter = com.ajb.common.utils.encryption.JPACryptoConverter.class)
+	//@Convert(converter = com.ajb.common.utils.encryption.JPACryptoConverter.class)
 	public String getEngineNo(){
 	public String getEngineNo(){
 		return this.engineNo;
 		return this.engineNo;
 	}
 	}
@@ -320,7 +320,7 @@ private static final long serialVersionUID = 1L;
 	}
 	}
 	/** ?? VIN编号,???? ag_po_quotation_vehicle.vin_no */
 	/** ?? VIN编号,???? ag_po_quotation_vehicle.vin_no */
 	@Column(name="vin_no")
 	@Column(name="vin_no")
-	@Convert(converter = com.ajb.common.utils.encryption.JPACryptoConverter.class)
+	//@Convert(converter = com.ajb.common.utils.encryption.JPACryptoConverter.class)
 	public String getVinNo(){
 	public String getVinNo(){
 		return this.vinNo;
 		return this.vinNo;
 	}
 	}
@@ -330,7 +330,7 @@ private static final long serialVersionUID = 1L;
 	}
 	}
 	/** ?? 车架号,???? ag_po_quotation_vehicle.frame_number */
 	/** ?? 车架号,???? ag_po_quotation_vehicle.frame_number */
 	@Column(name="frame_number")
 	@Column(name="frame_number")
-	@Convert(converter = com.ajb.common.utils.encryption.JPACryptoConverter.class)
+	//@Convert(converter = com.ajb.common.utils.encryption.JPACryptoConverter.class)
 	public String getFrameNumber(){
 	public String getFrameNumber(){
 		return this.frameNumber;
 		return this.frameNumber;
 	}
 	}
@@ -520,7 +520,7 @@ private static final long serialVersionUID = 1L;
 	}
 	}
 	/** ?? 证件号,???? ag_po_quotation_vehicle.owner_certi_code */
 	/** ?? 证件号,???? ag_po_quotation_vehicle.owner_certi_code */
 	@Column(name="owner_certi_code")
 	@Column(name="owner_certi_code")
-	@Convert(converter = com.ajb.common.utils.encryption.JPACryptoConverter.class)
+	//@Convert(converter = com.ajb.common.utils.encryption.JPACryptoConverter.class)
 	public String getOwnerCertiCode(){
 	public String getOwnerCertiCode(){
 		return this.ownerCertiCode;
 		return this.ownerCertiCode;
 	}
 	}
@@ -645,7 +645,7 @@ private static final long serialVersionUID = 1L;
 	}
 	}
 	/** ?? 平台型号编码,???? ag_po_quotation_vehicle.platform_model_code */
 	/** ?? 平台型号编码,???? ag_po_quotation_vehicle.platform_model_code */
 	@Column(name="platform_model_code")
 	@Column(name="platform_model_code")
-	@Convert(converter = com.ajb.common.utils.encryption.JPACryptoConverter.class)
+	//@Convert(converter = com.ajb.common.utils.encryption.JPACryptoConverter.class)
 	public String getPlatformModelCode(){
 	public String getPlatformModelCode(){
 		return this.platformModelCode;
 		return this.platformModelCode;
 	}
 	}