提交代码

OBE-COMMON-TOOLS/src/com/gx/tools/dialog/BatchSignatureDialog.java

@@ -102,7 +102,8 @@ public class BatchSignatureDialog extends EDialog {
 	 */
 	public BatchSignatureDialog(Shell parentShell, TenderProjectEntity tenderProjectEntity, boolean isHandSign, String pdfType) {
 		super(parentShell);
-		setTitle(Messages.Button_caSignature);
+//		setTitle(Messages.Button_caSignature);
+		setTitle("专家签章");
 		this.tenderProjectEntity = tenderProjectEntity;
 		this.pdfType = pdfType;
 		this.isHandSign = isHandSign;

OBE-COMMON-TOOLS/src/com/gx/tools/ole/bjca/BJCAHandPDFLoaderImpl.java

@@ -20,6 +20,7 @@ import com.gx.obe.common.file.enumeration.FileConstants;
 import com.gx.obe.config.ConfigConstants;
 import com.gx.obe.config.utils.PropertiesUtils;
 import com.gx.obe.util.utils.LogUtils;
+import com.gx.obe.util.utils.ObjectUtils;
 import com.gx.tools.ole.AutomationWrapper;
 import com.gx.tools.ole.DocumentLoader;
 import com.gx.tools.ole.bjca.listener.BJCAHandSignListener;
@@ -27,6 +28,9 @@ import com.gx.tools.ole.bjca.thread.BJCAHandSignThread;
 import com.jacob.activeX.ActiveXComponent;
 import com.jacob.com.ComThread;
 
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
 /**
  * @Description: 北京CA手写签字
  * @author guoyr
@@ -155,7 +159,13 @@ C:\Program Files (x86)\BJCAClient\PDFClientV2.1\Program\x86目录下的serverCer
 			showOrHiddenToolBar(0);
 			oleFrame.forceFocus();
 			site.forceFocus();
+//			Thread.sleep(2000);
+			new Thread(new Runnable() {
+				public void run() {
 					openFile(file);
+				}
+			}).start();
+			
 				
 			return true;
 		} catch (Exception e1) {
@@ -520,6 +530,58 @@ C:\Program Files (x86)\BJCAClient\PDFClientV2.1\Program\x86目录下的serverCer
 	public void addHandSignListener(BJCAHandSignListener handSignListener) {
 		this.handSignListener = handSignListener;
 	}
+//	/**
+//	 * 获取签名图片信息
+//	 * @return
+//	 */
+//	public String getSignImage(){
+//		String returnValue = "";
+//		if(null != automaticWrapper){
+//			returnValue = automaticWrapper.invoke("Pdf_Get_ScriptImg").getString();
+//			System.out.println(returnValue);
+//		}
+//		return returnValue;
+//	}
+	
+	public String getSignImage(){
+		String returnValue = "";
+		if(null != automaticWrapper){
+			returnValue = automaticWrapper.invoke("Pdf_Get_ScriptImg").getString();
+			String signReturnValue = automaticWrapper.invoke("GetSignInfo", new Variant[] {new Variant("center"), new Variant(0) }).getString();
+			System.out.println(returnValue);
+			try {
+				JSONObject root = JSONObject.fromObject(signReturnValue);
+				String code = ObjectUtils.getObjString(root.get("code"));
+				String pub = ObjectUtils.getObjString(root.get("pub"));
+				String signimgs = ObjectUtils.getObjString(root.get("signimgs"));
+				JSONArray supplierListArray = (JSONArray)root.get("signimgs");
+				Object[] supplierJsonList =  supplierListArray.toArray();
+				if(null != supplierJsonList && supplierJsonList.length > 0) {
+					JSONObject supplierJson = (JSONObject)supplierJsonList[0];
+					System.out.println(ObjectUtils.getObjString(supplierJson.get("img")));
+					returnValue = ObjectUtils.getObjString(supplierJson.get("img"));
+				}
+//				JSONObject tenderProjectJSON = (JSONObject)httpResponse.getDataJSONObject("tenderProjectList");
+			} catch (Exception e1) {
+			}
+		}
+		
+		
+		return returnValue;
+	}
+	/**
+	 * 获取签名图片信息
+	 * @return
+	 */
+	public String getFingerPrintImage(){
+		String returnValue = "";
+		if(null != automaticWrapper){
+			returnValue = automaticWrapper.invoke("Pdf_Get_FpImg").getString();
+			System.out.println(returnValue);
+		}
+		return returnValue;
+	}
+
 	/** 
 	 * @Description: 是否显示撤销签章
 	 * @author chenxw

OBE-COMPONENTS-CORE/src/com/gx/obe/web/entity/expert/Expert.java

@@ -57,6 +57,7 @@ public class Expert {
 	
 	private String projectId;
 	
+    private String signStatue;
 	/**
 	 * 专家base64位签名图片数据缓存
 	 */
@@ -128,6 +129,16 @@ public class Expert {
 		return expertTypeCN;
 	}
 	
+	
+	
+	public String getSignStatue() {
+		return signStatue;
+	}
+
+	public void setSignStatue(String signStatue) {
+		this.signStatue = signStatue;
+	}
+
 	public String getExpertTypeAndRole() {
 		String expertTypeCN = null;
 		expertTypeCN = ExpertEnum.getExpertTypeCN(getExpertType(), isLeader);