Procházet zdrojové kódy

接口测试更改

Antiloveg před 9 roky
rodič
revize
03ef73b293

+ 3 - 0
src/main/java/com/goafanti/common/model/PatentInfo.java

@@ -4,6 +4,9 @@ import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+@JsonInclude(value = Include.NON_NULL)
 public class PatentInfo {
     private String id;
 

+ 27 - 10
src/main/java/com/goafanti/techservice/patent/controller/PatentApiController.java

@@ -22,7 +22,7 @@ import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.util.CellRangeAddress;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.junit.Test;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -230,9 +230,19 @@ public class PatentApiController extends BaseApiController {
 	 * 管理端专利详情修改保存
 	 */
 	@RequestMapping(value = "/managePatentInfo", method = RequestMethod.POST)
-	public Result managePatentInfo(PatentInfo patentInfo, String xid, PatentLog patentLog ,String recordTimeFormattedDate) {
+	public Result managePatentInfo(String patentNumber,String patentName,String patentCatagory,String patentField, 
+			String patentDes,String patentWritingUrl,String authorizationNoticeUrl,String patentCertificateUrl,
+			String xid, PatentLog patentLog ,String recordTimeFormattedDate) {
 		Result res = new Result();
-		
+		PatentInfo patentInfo = new PatentInfo();
+		patentInfo.setId(xid);
+		patentInfo.setPatentNumber(patentNumber);
+		patentInfo.setPatentCatagory(StringUtils.isNumeric(patentCatagory)?Integer.parseInt(patentCatagory):null);
+		patentInfo.setPatentField(StringUtils.isNumeric(patentField)?Integer.parseInt(patentField):null);;
+		patentInfo.setPatentDes(patentDes);
+		patentInfo.setPatentWritingUrl(patentWritingUrl);
+		patentInfo.setAuthorizationNoticeUrl(authorizationNoticeUrl);
+		patentInfo.setPatentCertificateUrl(patentCertificateUrl);
 		Date d ;
 		if (!StringUtils.isBlank(recordTimeFormattedDate)) {
 			try {
@@ -245,7 +255,7 @@ public class PatentApiController extends BaseApiController {
 		    d = null;
 	    }
 		
-		if (patentLog != null) {
+		if (patentLog.getPrincipal() != null ) {
 			switch (patentLog.getState()) {
 			case 1:
 				patentInfo.setCreateTime(d);
@@ -259,12 +269,12 @@ public class PatentApiController extends BaseApiController {
 			}
 			patentInfo.setPatentState(patentLog.getState());
 			patentLog.setPid(xid);
+			patentLog.setId(UUID.randomUUID().toString());
 			patentLog.setRecordTime(d);
 			patentLog.setOperator(TokenManager.getAdminId());
 			patentLogService.insert(patentLog);
 		}
 		patentInfo.setId(xid);
-		//patentInfo,set
 		patentInfoService.updateByPrimaryKeySelective(patentInfo);
 		return res;
 	}
@@ -443,13 +453,19 @@ public class PatentApiController extends BaseApiController {
 	 * @throws ParseException 
 	 */
 	@RequestMapping(value = "/exportComposite", method = RequestMethod.GET)
-	public Result exportComposite(Integer serialNumber, String patentNumber, String office,
-			String locationProvince, String unitName, Integer patentCatagory, String patentName, Integer patentState,
-			String[] createTime, String[] patentApplicationDate, String author, HttpServletResponse response) throws ParseException{
+	public Result exportComposite(@RequestParam(name = "serialNumber", required = false) String serialNumber, String patentNumber, String office,
+			String locationProvince, String unitName, @RequestParam(name = "patentCatagory", required = false) String patentCatagory, String patentName, @RequestParam(name = "patentState", required = false) String patentState,
+			@RequestParam(name = "createTime[]", required = false) String[] createTime, @RequestParam(name = "patentApplicationDate[]", required = false) String[] patentApplicationDate, 
+			String author, HttpServletResponse response) throws ParseException{
 		Result res =  new Result();
+		
+		Integer sn = (!StringUtils.isNumeric(serialNumber)? null : Integer.parseInt(serialNumber));
+		Integer pc = (!StringUtils.isNumeric(patentCatagory)? null :Integer.parseInt(patentCatagory));
+		Integer ps = (!StringUtils.isNumeric(patentState)? null : Integer.parseInt(patentState));
+		String lp = ("undefined".equals(locationProvince)) ? null : locationProvince;
 		@SuppressWarnings("unchecked")
-		List<PatentCompositeBo> composites =(List<PatentCompositeBo>)getManagePatentList( serialNumber,  patentNumber,  office,
-				 locationProvince,  unitName,  patentCatagory,  patentName,  patentState,
+		List<PatentCompositeBo> composites =(List<PatentCompositeBo>)getManagePatentList( sn,  patentNumber,  office,
+				lp,  unitName,  pc,  patentName,  ps,
 				 createTime,  patentApplicationDate,  author , 1 , 1000).getList();
 		if (res.getError().isEmpty()) {
 			exportComosites(response, composites);
@@ -949,6 +965,7 @@ public class PatentApiController extends BaseApiController {
 		}
 		return state;
 	}
+	
 
 
 }

+ 1 - 1
src/main/resources/spring/spring-shiro.xml

@@ -21,7 +21,7 @@
 	    <constructor-arg index="1" value="${jedis.host}" name="host" type="java.lang.String"/>
 	    <constructor-arg index="2" value="${jedis.port}"  name="port" type="int"/>
 	    <constructor-arg index="3" value="${jedis.timeout}"  name="timeout" type="int"/>
-	    <constructor-arg index="4" value="${jedis.password}"  name="password" type="java.lang.String"/>
+	    <!-- <constructor-arg index="4" value="${jedis.password}"  name="password" type="java.lang.String"/> -->
 	  
 	</bean>
 	

+ 1 - 1
src/main/webapp/WEB-INF/web.xml

@@ -10,7 +10,7 @@
 		and Filters -->
 	<context-param>
 		<param-name>spring.profiles.active</param-name>
-		<param-value>dev</param-value>
+		<param-value>local</param-value>
 	</context-param>
 
 	<!-- Creates the Spring Container shared by all Servlets and Filters -->