Browse Source

专利编号类型更改

Antiloveg 9 years ago
parent
commit
bfb83a5923

+ 9 - 9
src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml

@@ -4,7 +4,7 @@
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.PatentInfo" >
     <id column="id" property="id" jdbcType="VARCHAR" />
     <result column="uid" property="uid" jdbcType="VARCHAR" />
-    <result column="serial_number" property="serialNumber" jdbcType="VARCHAR" />
+    <result column="serial_number" property="serialNumber" jdbcType="INTEGER" />
     <result column="patent_number" property="patentNumber" jdbcType="VARCHAR" />
     <result column="patent_name" property="patentName" jdbcType="VARCHAR" />
     <result column="patent_catagory" property="patentCatagory" jdbcType="INTEGER" />
@@ -64,7 +64,7 @@
       third_inventor_is_publish, create_time, author, authorized_date, 
       office, principal)
      
-    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{serialNumber,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, 
       #{patentNumber,jdbcType=VARCHAR}, #{patentName,jdbcType=VARCHAR}, #{patentCatagory,jdbcType=INTEGER}, 
       #{patentState,jdbcType=INTEGER}, #{patentField,jdbcType=INTEGER}, #{patentDes,jdbcType=VARCHAR}, 
       #{patentProryStatementUrl,jdbcType=VARCHAR}, #{patentWritingUrl,jdbcType=VARCHAR}, 
@@ -177,7 +177,7 @@
         #{uid,jdbcType=VARCHAR},
       </if>
       <if test="serialNumber != null" >
-        #{serialNumber,jdbcType=VARCHAR},
+        #{serialNumber,jdbcType=INTEGER},
       </if>
       <if test="patentNumber != null" >
         #{patentNumber,jdbcType=VARCHAR},
@@ -266,7 +266,7 @@
         uid = #{uid,jdbcType=VARCHAR},
       </if>
       <if test="serialNumber != null" >
-        serial_number = #{serialNumber,jdbcType=VARCHAR},
+        serial_number = #{serialNumber,jdbcType=INTEGER},
       </if>
       <if test="patentNumber != null" >
         patent_number = #{patentNumber,jdbcType=VARCHAR},
@@ -352,7 +352,7 @@
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.PatentInfo" >
     update patent_info
     set uid = #{uid,jdbcType=VARCHAR},
-      serial_number = #{serialNumber,jdbcType=VARCHAR},
+      serial_number = #{serialNumber,jdbcType=INTEGER},
       patent_number = #{patentNumber,jdbcType=VARCHAR},
       patent_name = #{patentName,jdbcType=VARCHAR},
       patent_catagory = #{patentCatagory,jdbcType=INTEGER},
@@ -443,7 +443,7 @@
 	where 1=1
 	 
 	<if test="serialNumber != null">
-	    and p.serial_number = #{serialNumber,jdbcType=VARCHAR}
+	    and p.serial_number = #{serialNumber,jdbcType=INTEGER}
 	</if>
 	<if test="patentNumber != null">
 	    and p.patent_number = #{patentNumber,jdbcType=VARCHAR}
@@ -516,7 +516,7 @@
 	where 1=1
 	 
 	<if test="serialNumber != null">
-	    and p.serial_number = #{serialNumber,jdbcType=VARCHAR}
+	    and p.serial_number = #{serialNumber,jdbcType=INTEGER}
 	</if>
 	<if test="patentNumber != null">
 	    and p.patent_number = #{patentNumber,jdbcType=VARCHAR}
@@ -623,7 +623,7 @@
 		 INNER JOIN organization_identity o ON u.id = o.uid
    where p.patent_state in (4,6) 
 	<if test="serialNumber != null">
-	    and p.serial_number = #{serialNumber,jdbcType=VARCHAR}
+	    and p.serial_number = #{serialNumber,jdbcType=INTEGER}
 	</if>
 	<if test="patentNumber != null">
 	    and p.patent_number = #{patentNumber,jdbcType=VARCHAR}
@@ -670,7 +670,7 @@
 		 INNER JOIN organization_identity o ON u.id = o.uid
    where p.patent_state in (4,6) 
 	<if test="serialNumber != null">
-	    and p.serial_number = #{serialNumber,jdbcType=VARCHAR}
+	    and p.serial_number = #{serialNumber,jdbcType=INTEGER}
 	</if>
 	<if test="patentNumber != null">
 	    and p.patent_number = #{patentNumber,jdbcType=VARCHAR}

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

@@ -12,7 +12,7 @@ public class PatentInfo {
     /**
     * 编号
     */
-    private String serialNumber;
+    private Integer serialNumber;
 
     /**
     * 申请号/专利号
@@ -159,16 +159,16 @@ public class PatentInfo {
     public void setUid(String uid) {
         this.uid = uid;
     }
+    
+    public Integer getSerialNumber() {
+		return serialNumber;
+	}
 
-    public String getSerialNumber() {
-        return serialNumber;
-    }
-
-    public void setSerialNumber(String serialNumber) {
-        this.serialNumber = serialNumber;
-    }
+	public void setSerialNumber(Integer serialNumber) {
+		this.serialNumber = serialNumber;
+	}
 
-    public String getPatentNumber() {
+	public String getPatentNumber() {
         return patentNumber;
     }
 

+ 4 - 3
src/main/java/com/goafanti/techservice/patent/bo/PatentApplicationFeeBo.java

@@ -16,7 +16,7 @@ public class PatentApplicationFeeBo {
 
 	private String	cid;
 
-	private String	serialNumber;
+	private Integer	serialNumber;
 
 	private String	patentNumber;
 
@@ -73,11 +73,12 @@ public class PatentApplicationFeeBo {
 		this.cid = cid;
 	}
 
-	public String getSerialNumber() {
+    
+	public Integer getSerialNumber() {
 		return serialNumber;
 	}
 
-	public void setSerialNumber(String serialNumber) {
+	public void setSerialNumber(Integer serialNumber) {
 		this.serialNumber = serialNumber;
 	}
 

+ 4 - 3
src/main/java/com/goafanti/techservice/patent/bo/PatentCompositeBo.java

@@ -17,7 +17,7 @@ public class PatentCompositeBo {
 	
 	private String pid;
 	
-	private String serialNumber;
+	private Integer serialNumber;
 	
 	private String patentNumber;
 	
@@ -103,11 +103,12 @@ public class PatentCompositeBo {
 		this.pid = pid;
 	}
 
-	public String getSerialNumber() {
+    
+	public Integer getSerialNumber() {
 		return serialNumber;
 	}
 
-	public void setSerialNumber(String serialNumber) {
+	public void setSerialNumber(Integer serialNumber) {
 		this.serialNumber = serialNumber;
 	}
 

+ 4 - 3
src/main/java/com/goafanti/techservice/patent/bo/PatentNoticeOfCorrectionBo.java

@@ -13,7 +13,7 @@ public class PatentNoticeOfCorrectionBo {
 		
 		private String pid;
 		
-		private String serialNumber;
+		private Integer serialNumber;
 		
 		private String patentNumber;
 		
@@ -57,11 +57,12 @@ public class PatentNoticeOfCorrectionBo {
 			this.pid = pid;
 		}
 
-		public String getSerialNumber() {
+
+		public Integer getSerialNumber() {
 			return serialNumber;
 		}
 
-		public void setSerialNumber(String serialNumber) {
+		public void setSerialNumber(Integer serialNumber) {
 			this.serialNumber = serialNumber;
 		}
 

+ 4 - 3
src/main/java/com/goafanti/techservice/patent/bo/PatentPendingBo.java

@@ -16,7 +16,7 @@ public class PatentPendingBo {
 	
 	private String cid;
 	
-	private String serialNumber;
+	private Integer serialNumber;
 	
 	private String patentNumber;
 	
@@ -66,11 +66,12 @@ public class PatentPendingBo {
 		this.cid = cid;
 	}
 
-	public String getSerialNumber() {
+
+	public Integer getSerialNumber() {
 		return serialNumber;
 	}
 
-	public void setSerialNumber(String serialNumber) {
+	public void setSerialNumber(Integer serialNumber) {
 		this.serialNumber = serialNumber;
 	}
 

+ 4 - 3
src/main/java/com/goafanti/techservice/patent/bo/PatentRecieveSendBo.java

@@ -13,7 +13,7 @@ public class PatentRecieveSendBo {
 
 	private String	rid;
 
-	private String	serialNumber;
+	private Integer	serialNumber;
 
 	private String	patentNumber;
 
@@ -81,11 +81,12 @@ public class PatentRecieveSendBo {
 		this.rid = rid;
 	}
 
-	public String getSerialNumber() {
+
+	public Integer getSerialNumber() {
 		return serialNumber;
 	}
 
-	public void setSerialNumber(String serialNumber) {
+	public void setSerialNumber(Integer serialNumber) {
 		this.serialNumber = serialNumber;
 	}
 

+ 0 - 1
src/main/java/com/goafanti/techservice/patent/bo/PatentRegistrationBo.java

@@ -1,6 +1,5 @@
 package com.goafanti.techservice.patent.bo;
 
-import java.util.Date;
 
 public class PatentRegistrationBo {
 	 /**

+ 98 - 12
src/main/java/com/goafanti/techservice/patent/controller/PatentApiController.java

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
 
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
@@ -140,7 +141,7 @@ public class PatentApiController extends BaseApiController {
 	 * @throws ParseException
 	 */
 	@RequestMapping(value = "/managePatentList", method = RequestMethod.POST)
-	public Result managePatentList(String serialNumber, String patentNumber, String office, String locationProvince,
+	public Result managePatentList(Integer serialNumber, String patentNumber, String office, String locationProvince,
 			String unitName, Integer patentCatagory, String patentName, Integer patentState,
 			@RequestParam(name = "createTime[]", required = false) String[] createTime,
 			@RequestParam(name = "patentApplicationDate[]", required = false) String[] patentApplicationDate,
@@ -283,7 +284,7 @@ public class PatentApiController extends BaseApiController {
 	 * 补正审查通知列表
 	 */
 	@RequestMapping(value = "/noticeOfCorrectionList", method = RequestMethod.POST)
-	public Result noticeOfCorrectionList(Date authorizedDate, String serialNumber, String patentNumber, String office,
+	public Result noticeOfCorrectionList(Date authorizedDate, Integer serialNumber, String patentNumber, String office,
 			String locationProvince, String unitName, Integer patentCatagory, String patentName, Integer patentState,
 			String author, String pageNo, String pageSize) {
 		Result res = new Result();
@@ -400,23 +401,84 @@ public class PatentApiController extends BaseApiController {
 	}
 	
 	/**
-	 * 下载专利代理委托书模版
+	 * 专利综合管理导出
+	 */
+	@RequestMapping(value="/exportComposite", method = RequestMethod.POST)
+	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){
+		Result res =  new Result();
+		return res;
+	}
+	
+	/**
+	 * 专利相关材料上传
+	 * @param req
+	 * @param sign 材料类型标记,其中'patent_prory_statement'为专利代理委托书标记
 	 * @return
 	 */
-	@RequestMapping(value="/downLoadTemplate",method = RequestMethod.GET)
+	@RequestMapping(value="/patentFile",method = RequestMethod.POST)
+	 public Result patentFile(HttpServletRequest req ,String sign ,String oid) {
+		 Result res = new Result();
+		 String fileName = "";
+		 if(StringUtils.isBlank(oid)){
+			 fileName = "/patent" + TokenManager.getUserId()+ "_" + sign + ".doc";
+		 }else{
+			 if(sign.equals("patent_prory_statement") || sign.equals("patent_writing")){
+				 fileName = "/patent" + oid + "_" + sign + ".doc";	 
+			 }else{
+				 fileName = "/patent" + oid + "_" + sign + ".jpg"; 
+			 }
+		 }
+		 res.setData(handleFile(res, fileName , req));
+		 return	  res; 
+	}
+	
+	
+	
+	/**
+	 * 下载专利代理委托书模版(用户端及管理端)
+	 * @return
+	 */
+	@RequestMapping(value="/downloadTemplate",method = RequestMethod.GET)
 	public Result downloadPatentProryStatement(HttpServletResponse response,  HttpServletRequest request){
 		Result res = new Result();
-		/*if(null == TokenManager.getAdminToken() || null == TokenManager.getToken()){
-			res.getError().add(buildError(ErrorConstants.FILE_NON_EXISTENT, "权限不足,无法下载!"));
-			return res;
-		}*/
 		String filename =Long.toString(System.nanoTime())+".doc"; 
+		String fileSaveRootPath = uploadPrivatePath + "/patent/patent_prory_statement.doc";
+		return patentDownload(res,response,filename,fileSaveRootPath);
+	}
+	
+	/**
+	 * 下载专利相关材料
+	 * @return
+	 */
+	@RequestMapping(value="/downloadFile",method = RequestMethod.GET)
+	public Result downloadPatentFile(HttpServletResponse response,  String path , String sign ,HttpServletRequest request){
+		Result res = new Result();
+		if(StringUtils.isBlank(path)){
+			res.getError().add(buildError(ErrorConstants.FILE_NON_EXISTENT, "下载文件不存在!"));
+			return res;
+		}
+		if(null == TokenManager.getAdminToken()){
+			res.getError().add(buildError(ErrorConstants.FILE_NON_EXISTENT, "权限不足,无法下载!"));	
+			return res;
+		}
+		String filename = "";
+		if(sign.equals("patent_prory_statement") || sign.equals("patent_writing")){
+		    filename =Long.toString(System.nanoTime())+".doc"; 
+		}else{
+			filename =Long.toString(System.nanoTime())+".jpg"; 
+		}
+		String fileSaveRootPath = uploadPrivatePath + path;
+		return patentDownload(res,response,filename,fileSaveRootPath);
+		
+	}
+	
+	private Result patentDownload(Result res,HttpServletResponse response,String filename,String fileSaveRootPath){
 		InputStream in = null;
 		OutputStream out = null;
 		byte[] buffer = new byte[8 * 1024];
-		String fileSaveRootPath = "";
 		try {
-			fileSaveRootPath = uploadPrivatePath + "/patent/patent_prory_statement.doc";
 			File file = new File(fileSaveRootPath);
 			in = new FileInputStream(file);
 		out = response.getOutputStream();
@@ -445,7 +507,31 @@ public class PatentApiController extends BaseApiController {
 		}
 	}
 		return res;
+			
 	}
+	
+	private String handleFile(Result res, String fileName,  HttpServletRequest req) {
+		List<MultipartFile> files = getFiles(req);
+		if (!files.isEmpty()) {
+			try {
+				MultipartFile mf = files.get(0);
+				mf.transferTo(toPrivateFile(fileName));
+				LoggerUtils.debug(getClass(), fileName + " 文件上传成功");
+			} catch (IllegalStateException | IOException e) {
+				LoggerUtils.error(getClass(), "文件上传失败", e);
+				res.getError().add(buildError("", "文件上传失败!"));
+				return "";
+			}
+		} else {
+			res.getError().add(buildError("", "文件上传失败!"));
+			return "";
+		}
+		return fileName;
+	}
+	
+	
+	
+	
 
 	// 专利纸件收发登记
 	private Pagination<PatentRecieveSendBo> getRecieveSendList(Integer pNo, Integer pSize) {
@@ -460,7 +546,7 @@ public class PatentApiController extends BaseApiController {
 	}
 
 	// 补正审查通知列表
-	private Pagination<PatentNoticeOfCorrectionBo> getNoticeOfCorrectionList(Date authorizedDate, String serialNumber,
+	private Pagination<PatentNoticeOfCorrectionBo> getNoticeOfCorrectionList(Date authorizedDate, Integer serialNumber,
 			String patentNumber, String office, String locationProvince, String unitName, Integer patentCatagory,
 			String patentName, Integer patentState, String author, Integer pNo, Integer pSize) {
 		return (Pagination<PatentNoticeOfCorrectionBo>) patentInfoService.getNoticeOfCorrectionList(authorizedDate,
@@ -476,7 +562,7 @@ public class PatentApiController extends BaseApiController {
 	}
 
 	// 管理端申请专利列表(专利综合管理)
-	private Pagination<PatentCompositeBo> getManagePatentList(String serialNumber, String patentNumber, String office,
+	private Pagination<PatentCompositeBo> getManagePatentList(Integer serialNumber, String patentNumber, String office,
 			String locationProvince, String unitName, Integer patentCatagory, String patentName, Integer patentState,
 			String[] createTime, String[] patentApplicationDate, String author, Integer pNo, Integer pSize)
 			throws ParseException {

+ 2 - 2
src/main/java/com/goafanti/techservice/patent/service/PatentInfoService.java

@@ -22,14 +22,14 @@ public interface PatentInfoService {
 	Pagination<PatentInfo> getClientApplyList(String userId, String patentNumber, String patentName,
 			Integer parentCatagory, Integer patentState, Integer pNo, Integer pSize);
 
-	Pagination<PatentCompositeBo> getManagePatentList(String serialNumber, String patentNumber, String office,
+	Pagination<PatentCompositeBo> getManagePatentList(Integer serialNumber, String patentNumber, String office,
 			String locationProvince, String unitName, Integer patentCatagory, String patentName, Integer patentState,
 			String[] createTime, String[] patentApplicationDate,  String author, Integer pNo,
 			Integer pSize)  throws ParseException;
 
 	Pagination<PatentPendingBo> getManagePendingPaymentList(String locationProvince, Integer pNo, Integer pSize);
 
-	Pagination<PatentNoticeOfCorrectionBo> getNoticeOfCorrectionList(Date authorizedDate, String serialNumber,
+	Pagination<PatentNoticeOfCorrectionBo> getNoticeOfCorrectionList(Date authorizedDate, Integer serialNumber,
 			String patentNumber, String office, String locationProvince, String unitName, Integer patentCatagory,
 			String patentName, Integer patentState, String author, Integer pNo, Integer pSize);
 

+ 4 - 4
src/main/java/com/goafanti/techservice/patent/service/impl/PatentInfoServiceImpl.java

@@ -92,7 +92,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<PatentCompositeBo> getManagePatentList(String serialNumber, String patentNumber, String office,
+	public Pagination<PatentCompositeBo> getManagePatentList(Integer serialNumber, String patentNumber, String office,
 			String locationProvince, String unitName, Integer patentCatagory, String patentName, Integer patentState,
 			String[] cDate, String[] pDate , String author, Integer pageNo,
 			Integer pageSize) throws ParseException {
@@ -133,7 +133,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 			params.put("pEnd", pEnd);
 		}
 		
-		if(serialNumber != null && serialNumber != ""){
+		if(serialNumber != null ){
 			params.put("serialNumber", serialNumber);
 		}
 		
@@ -206,7 +206,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<PatentNoticeOfCorrectionBo> getNoticeOfCorrectionList(Date authorizedDate, String serialNumber,
+	public Pagination<PatentNoticeOfCorrectionBo> getNoticeOfCorrectionList(Date authorizedDate, Integer serialNumber,
 			String patentNumber, String office, String locationProvince, String unitName, Integer patentCatagory,
 			String patentName, Integer patentState, String author, Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
@@ -215,7 +215,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 			params.put("authorizedDate", authorizedDate);
 		}
 		
-		if(serialNumber != null && serialNumber != ""){
+		if(serialNumber != null){
 			params.put("serialNumber", serialNumber);
 		}
 		

+ 4 - 7
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -268,14 +268,14 @@ public class UserApiController extends BaseApiController {
 	 * 
 	 * @param req
 	 * @return
-	 */
+	 *//*
 	
 	 @RequestMapping(value = "/patent/upload", method = RequestMethod.POST)
 	  public Result patentFile(HttpServletRequest req ,String sign) {
 		 Result res = new Result();
 		 res.setData(handleFile(res, "/patent/", true, req, sign));
 		 return	  res; 
-		 }
+		 }*/
 
 	
 
@@ -283,11 +283,8 @@ public class UserApiController extends BaseApiController {
 		List<MultipartFile> files = getFiles(req);
 		String fileName = "";
 		if (isPrivate || sign != "") {
-			if("/patent/".equals(path)){
-				fileName = path + TokenManager.getUserId() + sign + ".pdf";
-			}else{
-				fileName = path + TokenManager.getUserId() + sign + ".jpg";
-			}
+				fileName = path + TokenManager.getUserId() + "_" + sign + ".jpg";
+			
 		} else {
 			fileName = path + System.nanoTime() + ".jpg";
 		}

+ 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>local</param-value>
+		<param-value>dev</param-value>
 	</context-param>
 
 	<!-- Creates the Spring Container shared by all Servlets and Filters -->