From c60b41a154ce24c16e25f99f3adfb760812757cb Mon Sep 17 00:00:00 2001 From: ap007 Date: Mon, 1 Nov 2021 15:59:58 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessApplication/CustomerInfo.jsp | 4 +- WebContent/WEB-INF/etc/jbo/jbo_oti.xml | 29 ++++ .../serviceImp/FundIncomeVoucherJJCCB.java | 76 +++++++++ .../quartzmession/CorpusSourceFileCopy.java | 10 +- .../CorpusSourceRentPlanCopy.java | 1 + .../CorpusSourceRentPlanJJCCB.java | 146 ++++++++++++++++++ .../CorpusSourceRentResultCopy.java | 1 + 7 files changed, 265 insertions(+), 2 deletions(-) create mode 100644 src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherJJCCB.java create mode 100644 src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanJJCCB.java diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp index 271182133..8f431cd14 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp @@ -755,10 +755,12 @@ } function setIdexpiry(){ + var curDate = new Date(); + ; var date = document.getElementById("IDEXPIRY"); var dateValue = ""; dateValue = date.value; - AsDialog.OpenCalender(date,"yyyy/MM/dd","1900/01/01","2100/12/31",function(dateValue){ + AsDialog.OpenCalender(date,"yyyy/MM/dd",curDate.toLocaleDateString(),"2099/12/31",function(dateValue){ var myNewValue = "",myValue=""; myValue = this.dayValue; if(typeof(myValue)!="undefined" && myValue!="undefined"){ diff --git a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml index bc2262c33..1c4a634a6 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml @@ -410,6 +410,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherJJCCB.java b/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherJJCCB.java new file mode 100644 index 000000000..be5914660 --- /dev/null +++ b/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherJJCCB.java @@ -0,0 +1,76 @@ +package com.tenwa.voucher.serviceImp; + +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.dict.als.cache.CacheLoaderFactory; + +import java.util.Map; + +public class FundIncomeVoucherJJCCB extends FundIncomeVoucherInfoServiceImpl { + @Override + public void run() { + Transaction Sqlca =null; + try { + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + //todo 头上线将生产环境的编号放进来 + setVoucherConfigNo("PZ2021101200000035"); + setCorpusChannelNo("JJCCB"); + generateVoucher(Sqlca); + } catch (JBOException e) { + e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); + }finally { + try { + if(Sqlca!=null){ + Sqlca.disConnect(); + Sqlca = null; + } + } catch (JBOException e) { + e.printStackTrace(); + try { + Sqlca.rollback(); + } catch (JBOException jboException) { + jboException.printStackTrace(); + } + } + } + } + + /** + * 每条凭证各自差异数据放到参数List + * @param param + * @throws Exception + */ + @Override + public void addRespectiveParam(Map param) throws Exception { + String money = ""; + //100202为九江银行 + if("100202".equals(param.get("subjectsCode"))){ + money=param.get("TRANS_AMT"); + param.put("contractNo",""); + param.put("customerNo",""); + param.put("customerName",""); + //应财务要求九江银行填固定值（一般编码为银行的，都是11213，分内部外部） + param.put("cashFlow","11213"); + } + //长期应收款\回租\汽车\本金 + if("1531020101".equals(param.get("subjectsCode"))){ + money=param.get("TRANS_AMT"); + } + //未实现融资收益\回租\汽车 或 长期应收款\回租\汽车\利息 + if("15320201".equals(param.get("subjectsCode"))||"1531020102".equals(param.get("subjectsCode"))){ + money=this.getInterestTotalByContractId(param.get("contractId")); + } + //debit:借；credit:贷 + if("1".equals(param.get("entrydc"))) { + param.put("debitMoney",money); + param.put("creditMoney","0.00"); + }else{ + param.put("debitMoney","0.00"); + param.put("creditMoney",money); + } + } + + +} diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceFileCopy.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceFileCopy.java index 462c89472..38b72582b 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceFileCopy.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceFileCopy.java @@ -36,12 +36,13 @@ public class CorpusSourceFileCopy { private String contractId; private String fileType; + private String channelNo; public void doCopy(JBOTransaction tx) throws Exception { BizObjectManager ffpBom = null; ffpBom = JBOFactory.getBizObjectManager(FC_FILE_PUSH.CLASS_NAME,tx); //todo 添加渠道商的选择，哪些需要拷表哪些不需要 - String fileSql = "select ID,FILE_STS from O where FILE_TYPE='"+fileType+"' and FILE_STS='2'"; + String fileSql = "select ID,FILE_STS from O where FILE_TYPE='"+fileType+"' and CHANNEL_NO ='"+channelNo+"' and FILE_STS='2'"; List ffpBoList = ffpBom.createQuery(fileSql).getResultList(true); if(ffpBoList.size()==0){ ARE.getLog().info("暂时没有需要拷表的资方文件"); @@ -685,5 +686,12 @@ public class CorpusSourceFileCopy { public String getFileType() { return fileType; } public void setFileType(String fileType) { this.fileType = fileType; } + public String getChannelNo() { + return channelNo; + } + + public void setChannelNo(String channelNo) { + this.channelNo = channelNo; + } } diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java index 141fd9660..e7ed71048 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java @@ -28,6 +28,7 @@ public class CorpusSourceRentPlanCopy extends CorpusSourceFileCopy implements Jo try { tx = JBOFactory.createJBOTransaction(); setFileType("RepayPlan"); + setChannelNo("PSBC"); doCopy(tx); tx.commit(); QuartzUtil.insertLog(startime,"com.tenwa.lease.app.quartzmession.CorpusSourceRentPlanCopy", "success", "成功", curUserId); diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanJJCCB.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanJJCCB.java new file mode 100644 index 000000000..bd77ce110 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanJJCCB.java @@ -0,0 +1,146 @@ +package com.tenwa.lease.app.quartzmession; + +import com.amarsoft.are.ARE; +import com.amarsoft.are.jbo.*; +import com.amarsoft.are.util.StringFunction; +import com.amarsoft.awe.util.Transaction; +import com.base.util.QuartzUtil; +import jbo.app.tenwa.calc.LC_RENT_PLAN; +import jbo.oti.FC_FILE_PUSH; +import jbo.oti.FC_YC_FILE_REPAY_PLAN; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; + +import java.math.BigDecimal; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 资方租金计划拷贝 + */ +public class CorpusSourceRentPlanJJCCB extends CorpusSourceFileCopy implements Job { + private String fileType; + private String channelNo; + public String getFileType() { return fileType; } + + public void setFileType(String fileType) { this.fileType = fileType; } + public String getChannelNo() { + return channelNo; + } + + public void setChannelNo(String channelNo) { + this.channelNo = channelNo; + } + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + String startime = StringFunction.getTodayNow(); + Object userId = jobExecutionContext.getTrigger().getJobDataMap().get("CurUserId"); + String curUserId = userId == null? "system" : userId.toString(); + + JBOTransaction tx = null; + try { + tx = JBOFactory.createJBOTransaction(); + setFileType("RepayPlan"); + setChannelNo("JJCCB"); + this.doCopy(tx); + tx.commit(); + QuartzUtil.insertLog(startime,"com.tenwa.lease.app.quartzmession.CorpusSourceRentPlanCopy", "success", "成功", curUserId); + } catch (Exception e) { + e.printStackTrace(); + QuartzUtil.insertLog(startime,"com.tenwa.lease.app.quartzmession.CorpusSourceRentPlanCopy", "error", "失败", curUserId); + try { + if (tx != null) { + tx.rollback(); + } + } catch (JBOException e1) { + e1.printStackTrace(); + } + throw new JobExecutionException(e); + } + } + /** + * 执行自己类所需的操作 + * @param fyfrpBoList + * @param tx + * @throws Exception + */ + public void respectiveDo(List fyfrpBoList , JBOTransaction tx) throws Exception { + //获取对应的合同 + Map contractMap = getContractIdMap(fyfrpBoList); + if(contractMap.size()==0){ + String fcFileId = fyfrpBoList.get(0).getAttribute("FC_REQUEST_ID").toString(); + ARE.getLog().error("未找到FC_REQUEST_ID: "+fcFileId+" 对应的合同ID"); + throw new Exception("未找到FC_REQUEST_ID: "+fcFileId+" 对应的合同ID"); + } + Transaction Sqlca = Transaction.createTransaction(tx); + //===顺序不能错=== + //0.将租金计划拷贝到历史表 + copyRentPlanFormatToHis(contractMap,"安鹏原正式租金计划",tx); + //1.更新租金计划表（直接文件每条信息更新，不需要遍历） + updateRentPlan(fyfrpBoList,tx); + for(Map.Entry entry : contractMap.entrySet()){ + String contractId = entry.getKey(); + Map param = getParamByContractId(contractId,tx); + //2.更新剩余本金 + updateAllRemainCorpus(contractId,Sqlca); + //3.更新SP分润计划 + updateSplitSP(param,Sqlca); + //4.插入分润计划 + insertProfitPlan(param,tx); + //5.拷贝现金流到历史表 + copyCashFlowFormatToHis(contractId,"安鹏原正式现金流",tx); + //6.生成新的现金流 + createCashFlowByContractId(contractId,Sqlca); + //7.测算IRR + calcIRR(param,tx); + } + + } + + /** + * 根据文件ID获取《租金计划》信息 + * @param fcFileId + * @return + * @throws Exception + */ + public List getFileInfoByFileId(String fcFileId) throws Exception { + String sql = "select fr.CONTRACT_ID,O.FC_REQUEST_ID,O.LEND_TERM,O.ANS_REPAYMENT_DATE,O.ANS_PRINCIPAL,O.ANS_INTEREST,ANS_REPAYMENT_MONEY from O left join jbo.oti.FC_REQUEST fr on O.FC_REQUEST_ID=fr.ID where fr.DEL_FLAG='0' and O.FC_FILE_ID=:fcFileId"; + BizObjectManager fyfrpBom = JBOFactory.getBizObjectManager("FC_JJ_REPAY_PLAN.CLASS_NAME"); + List fyfrpBoList = fyfrpBom.createQuery(sql).setParameter("fcFileId",fcFileId).getResultList(false); + if(fyfrpBoList.size()==0){ + ARE.getLog().error("未找到FC_REQUEST_ID: "+fcFileId+" 对应的资方还款计划"); + throw new Exception("未找到FC_REQUEST_ID: "+fcFileId+" 对应的资方还款计划"); + } + return fyfrpBoList; + } + public void updateRentPlan(List fyfrpBoList,JBOTransaction tx) throws JBOException, ParseException { + BizObjectManager lrpBom = null; + lrpBom = JBOFactory.getBizObjectManager(LC_RENT_PLAN.CLASS_NAME,tx); + //更新租金计划表 + for(BizObject bo : fyfrpBoList){ + //获取参数 + String contractId = bo.getAttribute("CONTRACT_ID").toString(); + String lendTerm = bo.getAttribute("CURR_TERM").toString(); + String principal = bo.getAttribute("LOAN_TERM_PRIN").toString(); + String interest = bo.getAttribute("LOAN_TERM_INTEREST").toString(); + String rent = bo.getAttribute("LOAN_TERM_FEE").toString(); + String repaymentDate = bo.getAttribute("PMT_DUE_DATE").toString(); + //转换日期格式 + Date date = new SimpleDateFormat("yyyyMMdd").parse(repaymentDate); + repaymentDate = new SimpleDateFormat("yyyy/MM/dd").format(date); + //更新租金计划表 + BizObject lrpBo = lrpBom.createQuery("CONTRACT_ID=:contractId and PLAN_LIST=:lendTerm").setParameter("contractId",contractId).setParameter("lendTerm",lendTerm).getSingleResult(true); + lrpBo.setAttributeValue("RENT",rent); + lrpBo.setAttributeValue("CORPUS",principal); + lrpBo.setAttributeValue("INTEREST",interest); + lrpBo.setAttributeValue("CORPUS_BUSINESS",principal); + lrpBo.setAttributeValue("INTEREST_BUSINESS",interest); + lrpBo.setAttributeValue("PLAN_DATE",repaymentDate); + lrpBom.saveObject(lrpBo); + } + } +} diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentResultCopy.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentResultCopy.java index 0737dcc52..b3a211884 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentResultCopy.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentResultCopy.java @@ -31,6 +31,7 @@ public class CorpusSourceRentResultCopy extends CorpusSourceFileCopy implements try { tx = JBOFactory.createJBOTransaction(); setFileType("RepayResult"); + setChannelNo("PSBC"); doCopy(tx); tx.commit(); QuartzUtil.insertLog(startime,"com.tenwa.lease.app.quartzmession.CorpusSourceRentPlanCopy", "success", "成功", curUserId); From 37bdfa617da38c3639be791e7f65e7bc749fee18 Mon Sep 17 00:00:00 2001 From: "zhanglei@ap-leasing.com.cn" Date: Wed, 16 Feb 2022 14:01:33 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E9=93=B6=E8=81=94=EF=BC=88NUSAGE?= =?UTF-8?q?=EF=BC=89=E5=AD=97=E6=AE=B5=E7=AE=97=E6=B3=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sdk/controller/CmbToPayController.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java b/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java index 41e39d1a6..123e7834b 100644 --- a/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java +++ b/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java @@ -582,22 +582,16 @@ public class CmbToPayController extends BaseFlowStartAction { for(int i = 0; i < c.length; i ++){ //二进制超过8位则为汉字 String len = Integer.toBinaryString(c[i]); - if(ChineseFlag){ - if(len.length() > 8){ - count=count+2; + if(len.length() > 8){ + if(!ChineseFlag){ + count=count+4; ChineseFlag = true; }else{ - count ++; - ChineseFlag = false; + count=count+2; } }else{ - if(len.length() > 8){ - count=count+2+2; - ChineseFlag = true; - }else{ - count ++; - ChineseFlag = false; - } + count ++; + ChineseFlag = false; } if(count==length){ str = str.substring(0,i+1); From 160337529389c71960fbf64a6e31ac33d894334f Mon Sep 17 00:00:00 2001 From: "zhanglei@ap-leasing.com.cn" Date: Fri, 18 Feb 2022 18:10:59 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E7=BB=8F=E7=90=86=E8=A7=92=E8=89=B2=E7=94=A8=E4=BA=8E=E6=BF=80?= =?UTF-8?q?=E6=B4=BB=E7=BB=8F=E9=94=80=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributorRegister/CLMSDistributorList.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp b/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp index 2987ce6ec..f6276559a 100644 --- a/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp +++ b/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp @@ -17,7 +17,7 @@ dwTemp.ReadOnly = "1"; //只读模式 dwTemp.setPageSize(20); dwTemp.genHTMLObjectWindow(""); - boolean flag = CurUser.hasRole("800R00000070");// 2021/02/26 作废（汽车业务部总监）角色改用（汽车业务部前台副总监） + boolean flag = CurUser.hasRole("800R00000070")||CurUser.hasRole("800R00000077");// 2021/02/26 作废（汽车业务部总监）角色改用（汽车业务部前台副总监） String sButtons[][] =null; if(flag){ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 From 8a75ee1695061c0a934f2a93786eb3f8c6015176 Mon Sep 17 00:00:00 2001 From: "zhanglei@ap-leasing.com.cn" Date: Thu, 24 Feb 2022 18:04:17 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=8A=A5=E6=96=87=EF=BC=88=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=E7=89=88=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessProjectTempInfo.jsp | 36 +++++ config/icms.properties | 5 + src/com/ample/icms/query/ImageAttr.java | 127 ++++++++++++++++++ src/com/ample/icms/query/ImageBaseData.java | 62 +++++++++ src/com/ample/icms/query/ImageBatch.java | 87 ++++++++++++ src/com/ample/icms/query/ImageMetaData.java | 10 ++ src/com/ample/icms/query/ImageQuery.java | 5 + src/com/ample/icms/query/ImageRoot.java | 14 ++ src/com/ample/icms/query/ImageTree.java | 24 ++++ 9 files changed, 370 insertions(+) create mode 100644 config/icms.properties create mode 100644 src/com/ample/icms/query/ImageAttr.java create mode 100644 src/com/ample/icms/query/ImageBaseData.java create mode 100644 src/com/ample/icms/query/ImageBatch.java create mode 100644 src/com/ample/icms/query/ImageMetaData.java create mode 100644 src/com/ample/icms/query/ImageQuery.java create mode 100644 src/com/ample/icms/query/ImageRoot.java create mode 100644 src/com/ample/icms/query/ImageTree.java diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp index c6c5febaa..9cd2fed8b 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp @@ -171,5 +171,41 @@ return true; } } + + function openFileList(){ + let url = getRequestUrl(); + let param = getRequestParam(); + post(url,param); + } + function getRequestUrl(){ + let url = RunJavaMethod("","",""); + return url; + } + function getRequestParam(){ + let param = RunJavaMethod("","",""); + return param; + } + /** + * 考虑防止一些浏览器的弹窗被阻止，不用ajax，而是用form表单提交的方式 + * @param URL + * @param PARAMS + */ + function post(URL, PARAMS) { + let temp_form = document.createElement("form"); + temp_form.action = URL; + temp_form.target = "_blank"; + temp_form.method = "post"; + temp_form.style.display = "none"; + for (let param in PARAMS) { + let opt = document.createElement("textarea"); + opt.name = param; + opt.value = PARAMS[param]; + temp_form.appendChild(opt); + } + document.body.appendChild(temp_form); + temp_form.submit(); + } + + <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/config/icms.properties b/config/icms.properties new file mode 100644 index 000000000..6c411635a --- /dev/null +++ b/config/icms.properties @@ -0,0 +1,5 @@ +url=http://39.106.190.65:8080/SunECM/servlet/RouterServlet +#链接有效时间，单位为秒 +useful_life=10 +#业务系统授权密钥 +secret_key= diff --git a/src/com/ample/icms/query/ImageAttr.java b/src/com/ample/icms/query/ImageAttr.java new file mode 100644 index 000000000..c348c6182 --- /dev/null +++ b/src/com/ample/icms/query/ImageAttr.java @@ -0,0 +1,127 @@ +package com.ample.icms.query; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamAsAttribute; + +import java.util.List; + +@XStreamAlias("NODE") +public class ImageAttr { + + @XStreamAlias("ID") + @XStreamAsAttribute + private String id ; + + //资料名称 + @XStreamAlias("NAME") + @XStreamAsAttribute + private String name ; + + //资料权限（CRUD） + @XStreamAlias("RIGHT") + @XStreamAsAttribute + private String right ; + + //影像资料压缩大小像素 例如800*800 （非必填） + @XStreamAlias("RESEIZE") + @XStreamAsAttribute + private String reseize ; + + //是否是子节点 1-是子节点、0-父节点 + @XStreamAlias("CHILD_FLAG") + @XStreamAsAttribute + private String childFlag ; + + //资料条码 用于系统区分资料类型自动归类 （非必填） + @XStreamAlias("BARCODE") + @XStreamAsAttribute + private String barcode ; + + //资料最大上传数量 + @XStreamAlias("MAXPAGES") + @XStreamAsAttribute + private String maxPages ; + + //资料最小上传数量 + @XStreamAlias("MINPAGES") + @XStreamAsAttribute + private String minPages ; + + @XStreamAlias("NODE") + public List images ; + + public ImageAttr() { + + } + public ImageAttr(List images) { + this.images = images; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getRight() { + return right; + } + + public void setRight(String right) { + this.right = right; + } + + public String getReseize() { + return reseize; + } + + public void setReseize(String reseize) { + this.reseize = reseize; + } + + public String getChildFlag() { + return childFlag; + } + + public void setChildFlag(String childFlag) { + this.childFlag = childFlag; + } + + public String getBarcode() { + return barcode; + } + + public void setBarcode(String barcode) { + this.barcode = barcode; + } + + public String getMaxPages() { + return maxPages; + } + + public void setMaxPages(String maxPages) { + this.maxPages = maxPages; + } + + public String getMinPages() { + return minPages; + } + + public void setMinPages(String minPages) { + this.minPages = minPages; + } + + + + +} diff --git a/src/com/ample/icms/query/ImageBaseData.java b/src/com/ample/icms/query/ImageBaseData.java new file mode 100644 index 000000000..e3af26994 --- /dev/null +++ b/src/com/ample/icms/query/ImageBaseData.java @@ -0,0 +1,62 @@ +package com.ample.icms.query; + +import com.thoughtworks.xstream.annotations.XStreamAlias; + +@XStreamAlias("BASE_DATA") +public class ImageBaseData { + //操作员代码 + @XStreamAlias("USER_CODE") + private String userCode; + //操作员名称 + @XStreamAlias("USER_NAME") + private String userName; + //机构代码 + @XStreamAlias("ORG_CODE") + private String orgCode; + //机构名称 + @XStreamAlias("ORG_NAME") + private String orgName; + //操作员角色 + @XStreamAlias("ROLE_CODE") + private String roleCode; + + public String getUserCode() { + return userCode; + } + + public void setUserCode(String userCode) { + this.userCode = userCode; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getOrgCode() { + return orgCode; + } + + public void setOrgCode(String orgCode) { + this.orgCode = orgCode; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public String getRoleCode() { + return roleCode; + } + + public void setRoleCode(String roleCode) { + this.roleCode = roleCode; + } +} diff --git a/src/com/ample/icms/query/ImageBatch.java b/src/com/ample/icms/query/ImageBatch.java new file mode 100644 index 000000000..1d7f7c707 --- /dev/null +++ b/src/com/ample/icms/query/ImageBatch.java @@ -0,0 +1,87 @@ +package com.ample.icms.query; + +import com.thoughtworks.xstream.annotations.XStreamAlias; + +@XStreamAlias("BATCH") +public class ImageBatch { + + //业务类型代码 + @XStreamAlias("APP_CODE") + private String appCode ; + + //业务类型名称 + @XStreamAlias("APP_NAME") + private String appName ; + + //业务主索引 + @XStreamAlias("CASENO") + private String caseNo ; + + //业务扩展索引(非必填) + @XStreamAlias("CARNO") + private String carNo ; + + // + @XStreamAlias("START_TIME") + private String startTime ; + + // + @XStreamAlias("END_TIME") + private String endTime; + + // + @XStreamAlias("VTREE") + private ImageTree vTree; + + public ImageBatch(ImageTree vTree) { + this.vTree = vTree; + } + + public String getAppCode() { + return appCode; + } + + public void setAppCode(String appCode) { + this.appCode = appCode; + } + + public String getAppName() { + return appName; + } + + public void setAppName(String appName) { + this.appName = appName; + } + + public String getCaseNo() { + return caseNo; + } + + public void setCaseNo(String caseNo) { + this.caseNo = caseNo; + } + + public String getCarNo() { + return carNo; + } + + public void setCarNo(String carNo) { + this.carNo = carNo; + } + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } +} diff --git a/src/com/ample/icms/query/ImageMetaData.java b/src/com/ample/icms/query/ImageMetaData.java new file mode 100644 index 000000000..63419c284 --- /dev/null +++ b/src/com/ample/icms/query/ImageMetaData.java @@ -0,0 +1,10 @@ +package com.ample.icms.query; + +import com.thoughtworks.xstream.annotations.XStreamAlias; + +import java.util.List; + +@XStreamAlias("META_DATA") +public class ImageMetaData { + public List imageBatchs; +} diff --git a/src/com/ample/icms/query/ImageQuery.java b/src/com/ample/icms/query/ImageQuery.java new file mode 100644 index 000000000..46bfa33a6 --- /dev/null +++ b/src/com/ample/icms/query/ImageQuery.java @@ -0,0 +1,5 @@ +package com.ample.icms.query; + +public class ImageQuery { + +} diff --git a/src/com/ample/icms/query/ImageRoot.java b/src/com/ample/icms/query/ImageRoot.java new file mode 100644 index 000000000..28a51f67f --- /dev/null +++ b/src/com/ample/icms/query/ImageRoot.java @@ -0,0 +1,14 @@ +package com.ample.icms.query; + +import com.thoughtworks.xstream.annotations.XStreamAlias; + +@XStreamAlias("root") +public class ImageRoot { + private ImageBaseData imageBaseData; + private ImageMetaData imageMetaData; + + public ImageRoot(ImageBaseData imageBaseData, ImageMetaData imageMetaData) { + this.imageBaseData = imageBaseData; + this.imageMetaData = imageMetaData; + } +} diff --git a/src/com/ample/icms/query/ImageTree.java b/src/com/ample/icms/query/ImageTree.java new file mode 100644 index 000000000..f5c7389e4 --- /dev/null +++ b/src/com/ample/icms/query/ImageTree.java @@ -0,0 +1,24 @@ +package com.ample.icms.query; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamAsAttribute; + +import java.util.List; +@XStreamAlias("VTREE") +public class ImageTree { + + @XStreamAlias("APP_CODE") + @XStreamAsAttribute + private String appCode ; + + @XStreamAlias("APP_NAME") + @XStreamAsAttribute + private String appName ; + + private List images; + + public ImageTree(List images) { + this.images = images; + } + +} From fd6a8550df3595b579ce84d8e9734c8e28dc1fca Mon Sep 17 00:00:00 2001 From: "zhanglei@ap-leasing.com.cn" Date: Fri, 18 Mar 2022 16:06:42 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=EF=BC=88=E8=8D=89=E7=A8=BF=E7=89=88=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessProjectTempInfo.jsp | 28 +-- .../WEB-INF/lib/sunecm-url-encode-1.1.jar | Bin 0 -> 7928 bytes WebContent/WEB-INF/lib/sunecm_outer-1.3.jar | Bin 0 -> 26365 bytes config/icms.properties | 8 +- .../ample/icms/{query => bean}/ImageAttr.java | 2 +- .../icms/{query => bean}/ImageBaseData.java | 49 +++++- .../icms/{query => bean}/ImageBatch.java | 21 +-- src/com/ample/icms/bean/ImageBizInfo.java | 14 ++ src/com/ample/icms/bean/ImageBizType.java | 22 +++ src/com/ample/icms/bean/ImageMetaData.java | 12 ++ .../ample/icms/{query => bean}/ImageRoot.java | 4 +- .../ample/icms/{query => bean}/ImageTree.java | 3 +- src/com/ample/icms/check/ImageCheck.java | 16 ++ src/com/ample/icms/query/ImageMetaData.java | 10 -- src/com/ample/icms/query/ImageQuery.java | 4 +- src/com/ample/icms/scan/ImageScan.java | 27 +++ src/com/ample/icms/scan/ImageUpload.java | 20 +++ src/com/ample/icms/service/ImageService.java | 163 ++++++++++++++++++ src/com/ample/icms/util/PropertiesUtil.java | 38 ++++ src_core/com/tenwa/util/test.java | 146 +++++++++++++--- 20 files changed, 523 insertions(+), 64 deletions(-) create mode 100644 WebContent/WEB-INF/lib/sunecm-url-encode-1.1.jar create mode 100644 WebContent/WEB-INF/lib/sunecm_outer-1.3.jar rename src/com/ample/icms/{query => bean}/ImageAttr.java (98%) rename src/com/ample/icms/{query => bean}/ImageBaseData.java (57%) rename src/com/ample/icms/{query => bean}/ImageBatch.java (78%) create mode 100644 src/com/ample/icms/bean/ImageBizInfo.java create mode 100644 src/com/ample/icms/bean/ImageBizType.java create mode 100644 src/com/ample/icms/bean/ImageMetaData.java rename src/com/ample/icms/{query => bean}/ImageRoot.java (80%) rename src/com/ample/icms/{query => bean}/ImageTree.java (94%) create mode 100644 src/com/ample/icms/check/ImageCheck.java delete mode 100644 src/com/ample/icms/query/ImageMetaData.java create mode 100644 src/com/ample/icms/scan/ImageScan.java create mode 100644 src/com/ample/icms/scan/ImageUpload.java create mode 100644 src/com/ample/icms/service/ImageService.java create mode 100644 src/com/ample/icms/util/PropertiesUtil.java diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp index 9cd2fed8b..caf84bd30 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp @@ -58,7 +58,8 @@ dwTemp.genHTMLObjectWindow(CurPage.getParameter("FlowUnid")); dwTemp.replaceColumn("customer_info", "", CurPage.getObjectWindowOutput()); String sButtons[][] = { - {"ReadOnly".equals(rightType)?"false":"true","","Button","保存","保存","save()","","","","btn_icon_saveNew",""} + {"ReadOnly".equals(rightType)?"false":"true","","Button","保存","保存","save()","","","","btn_icon_saveNew",""}, + {"ReadOnly".equals(rightType)?"false":"true","","Button","资料清单","资料清单","openFileList()","","","","btn_icon_saveNew",""} }; %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> @@ -174,15 +175,22 @@ function openFileList(){ let url = getRequestUrl(); - let param = getRequestParam(); - post(url,param); + let params = getRequestParam(); + post(url,params); } function getRequestUrl(){ - let url = RunJavaMethod("","",""); + let url = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestUrl",""); return url; } function getRequestParam(){ - let param = RunJavaMethod("","",""); + let appCode = 'BQCW-000010'; + let appName = '业务申请'; + let code = 'ECM0002'; + if(("<%=sPhaseNo%>"=="0010") && ("<%=FlowNo%>"=="BusinessApplyFlow" || "<%=FlowNo%>" == "BusinessChangeFlow")){ + code = 'ECM0001'; + } + let busiNo = '<%=sFlowUnid%>'; + let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo); return param; } /** @@ -190,18 +198,18 @@ * @param URL * @param PARAMS */ - function post(URL, PARAMS) { + function post(URL, param) { let temp_form = document.createElement("form"); temp_form.action = URL; temp_form.target = "_blank"; temp_form.method = "post"; temp_form.style.display = "none"; - for (let param in PARAMS) { + let opt = document.createElement("textarea"); - opt.name = param; - opt.value = PARAMS[param]; + opt.name = 'data'; + opt.value = param; temp_form.appendChild(opt); - } + document.body.appendChild(temp_form); temp_form.submit(); } diff --git a/WebContent/WEB-INF/lib/sunecm-url-encode-1.1.jar b/WebContent/WEB-INF/lib/sunecm-url-encode-1.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..fc1f2057580a26654f1608a9497e528beff1a647 GIT binary patch literal 7928 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 literal 0 HcmV?d00001 diff --git a/WebContent/WEB-INF/lib/sunecm_outer-1.3.jar b/WebContent/WEB-INF/lib/sunecm_outer-1.3.jar new file mode 100644 index 0000000000000000000000000000000000000000..20846b19b6e66bf1a3aa6b049a5613c1a6ca0e7c GIT binary patch literal 26365 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 v^WEZ)BM5#e4&55T?7q%##^ imageBatchs ; +} diff --git a/src/com/ample/icms/query/ImageRoot.java b/src/com/ample/icms/bean/ImageRoot.java similarity index 80% rename from src/com/ample/icms/query/ImageRoot.java rename to src/com/ample/icms/bean/ImageRoot.java index 28a51f67f..e933fc91b 100644 --- a/src/com/ample/icms/query/ImageRoot.java +++ b/src/com/ample/icms/bean/ImageRoot.java @@ -1,10 +1,12 @@ -package com.ample.icms.query; +package com.ample.icms.bean; import com.thoughtworks.xstream.annotations.XStreamAlias; @XStreamAlias("root") public class ImageRoot { + @XStreamAlias("BASE_DATA") private ImageBaseData imageBaseData; + @XStreamAlias("META_DATA") private ImageMetaData imageMetaData; public ImageRoot(ImageBaseData imageBaseData, ImageMetaData imageMetaData) { diff --git a/src/com/ample/icms/query/ImageTree.java b/src/com/ample/icms/bean/ImageTree.java similarity index 94% rename from src/com/ample/icms/query/ImageTree.java rename to src/com/ample/icms/bean/ImageTree.java index f5c7389e4..985b87a72 100644 --- a/src/com/ample/icms/query/ImageTree.java +++ b/src/com/ample/icms/bean/ImageTree.java @@ -1,9 +1,10 @@ -package com.ample.icms.query; +package com.ample.icms.bean; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import java.util.List; + @XStreamAlias("VTREE") public class ImageTree { diff --git a/src/com/ample/icms/check/ImageCheck.java b/src/com/ample/icms/check/ImageCheck.java new file mode 100644 index 000000000..806ae5dde --- /dev/null +++ b/src/com/ample/icms/check/ImageCheck.java @@ -0,0 +1,16 @@ +package com.ample.icms.check; + +import com.ample.icms.service.ImageService; + +public class ImageCheck extends ImageService { + public void getResult(){ + String result = doPost(); + if(result.contains("200")){ + //true + }else if(result.contains("-1")){ + //error + }else{ + //false + } + } +} diff --git a/src/com/ample/icms/query/ImageMetaData.java b/src/com/ample/icms/query/ImageMetaData.java deleted file mode 100644 index 63419c284..000000000 --- a/src/com/ample/icms/query/ImageMetaData.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.ample.icms.query; - -import com.thoughtworks.xstream.annotations.XStreamAlias; - -import java.util.List; - -@XStreamAlias("META_DATA") -public class ImageMetaData { - public List imageBatchs; -} diff --git a/src/com/ample/icms/query/ImageQuery.java b/src/com/ample/icms/query/ImageQuery.java index 46bfa33a6..f9a223bca 100644 --- a/src/com/ample/icms/query/ImageQuery.java +++ b/src/com/ample/icms/query/ImageQuery.java @@ -1,5 +1,7 @@ package com.ample.icms.query; -public class ImageQuery { +import com.ample.icms.service.ImageService; + +public class ImageQuery extends ImageService { } diff --git a/src/com/ample/icms/scan/ImageScan.java b/src/com/ample/icms/scan/ImageScan.java new file mode 100644 index 000000000..b7ddb3bb6 --- /dev/null +++ b/src/com/ample/icms/scan/ImageScan.java @@ -0,0 +1,27 @@ +package com.ample.icms.scan; + +import com.ample.icms.bean.ImageBaseData; +import com.ample.icms.service.ImageService; + +public class ImageScan extends ImageService { + private String oneBatch; + @Override + public void addBaseData(){ + base = new ImageBaseData(); + base.setUserCode("admin"); + base.setUserName("admin"); + base.setOrgCode("0005"); + base.setComCode("0005"); + base.setOrgName("安鹏国际融资租赁(深圳)有限公司"); + base.setRoleCode("admin"); + base.setOneBatch(oneBatch); + } + public String getOneBatch() { + return oneBatch; + } + + public void setOneBatch(String oneBatch) { + this.oneBatch = oneBatch; + } + +} diff --git a/src/com/ample/icms/scan/ImageUpload.java b/src/com/ample/icms/scan/ImageUpload.java new file mode 100644 index 000000000..4e7023d75 --- /dev/null +++ b/src/com/ample/icms/scan/ImageUpload.java @@ -0,0 +1,20 @@ +package com.ample.icms.scan; + +import com.sunyard.insurance.ecm.socket.client.AutoScanApi; + +public class ImageUpload { + public void doUpload(){ + String zipPath = "C:/Users/ivanl/Desktop/影像系统/ECM4.0Demo/ECM4.0Demo/第三方上传/1111.zip"; + try { + // " sunyard#licenseKey" ：sunyard为接入系统ID，licenseKey为接入系统授权密钥 + AutoScanApi autoScanApi = new AutoScanApi("192.168.7.71",8081,"anpeng#IU2VHdejDpUFzhoeT7tUSII3"); +// // "10I" : 业务类型 +// // zipPath ：要上传批次文件的zip包的路径 +// // returnMsg ： 第三方上传的返回状态 + String returnMsg = autoScanApi.ScanImageFile("FBO2022031100000001", zipPath); + System.out.println(returnMsg); + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/src/com/ample/icms/service/ImageService.java b/src/com/ample/icms/service/ImageService.java new file mode 100644 index 000000000..1fb2f7c5c --- /dev/null +++ b/src/com/ample/icms/service/ImageService.java @@ -0,0 +1,163 @@ +package com.ample.icms.service; + +import com.ample.icms.bean.ImageBaseData; +import com.ample.icms.bean.ImageBatch; +import com.ample.icms.bean.ImageMetaData; +import com.ample.icms.bean.ImageRoot; +import com.ample.icms.util.PropertiesUtil; +import com.sunyard.insurance.encode.client.EncodeAccessParam; +import com.thoughtworks.xstream.XStream; +import org.apache.log4j.Logger; + +import java.io.IOException; +import java.util.ArrayList; + +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.HttpException; +import org.apache.commons.httpclient.HttpStatus; +import org.apache.commons.httpclient.SimpleHttpConnectionManager; +import org.apache.commons.httpclient.methods.PostMethod; + +public class ImageService { + public Logger logger = Logger.getLogger(this.getClass()); + protected String appCode; + protected String appName; + protected String code; + protected String busiNo; + protected ImageBaseData base; + protected ImageBatch batch; + protected ImageMetaData metaData; + public void addBaseData(){ + base = new ImageBaseData(); + base.setUserCode("admin"); + base.setUserName("admin"); + base.setOrgCode("0005"); + base.setComCode("0005"); + base.setOrgName("安鹏国际融资租赁(深圳)有限公司"); + base.setRoleCode("admin"); + } + public void addBatch(){ + batch = new ImageBatch(); + batch.setAppCode(this.appCode); + batch.setAppName(this.appName); + batch.setBusiNo(this.busiNo); + } + public void addMetaData(){ + metaData = new ImageMetaData(); + metaData.imageBatchs = new ArrayList<>(); + metaData.imageBatchs.add(batch); + } + public ImageRoot createData(){ + addBaseData(); + addBatch(); + addMetaData(); + ImageRoot root = new ImageRoot(base,metaData); + return root; + } + public String getRequestXML(){ + XStream xs = new XStream(); + xs.processAnnotations(ImageRoot.class); + String xml = xs.toXML(createData()); + xml = xml.replace("__","_"); + xml = "\n" + xml; + logger.info("\n"+xml+"\n"); + return xml; + } + + public String transformXMLtoParam(String code ,String xml) throws Exception { + int time = Integer.parseInt(PropertiesUtil.get("useful_life")); + String secretKey = PropertiesUtil.get("secret_key"); + String param = EncodeAccessParam.getEncodeParam("format=xml&code="+code+"&xml="+xml, time, secretKey); + return param; + } + + public String doPost(){ + String result="0000"; + PostMethod postMethod = null; + HttpClient httpClient = null; + try { + postMethod = new PostMethod(PropertiesUtil.get("secret_key")); + // 设置格式 + postMethod.getParams().setContentCharset("UTF-8"); + postMethod.setParameter("data", getRequestParam()); + // ICMS影像系统通过referer来验证白名单，所以必须将ip填写在这里 + //todo + postMethod.setRequestHeader("Referer", "http://172.16.20.212/imaging"); + httpClient = new HttpClient(); + // 执行postMethod + int statusCode = httpClient.executeMethod(postMethod); + System.out.println("结果状态："+statusCode); + if (statusCode == HttpStatus.SC_OK) { + byte[] bodydata = postMethod.getResponseBody(); + //取得返回值 + result = new String(bodydata, "UTF-8"); + System.out.println("影像系统返回结果：" + result); + } + }catch (HttpException e) { + //协议发生异常，URL不合法请检查URL！ + e.printStackTrace(); + } catch (IOException e) { + //请检查网络是否通畅，检查网线是否插好！ + e.printStackTrace(); + } catch(Exception e){ + e.printStackTrace(); + }finally { + if (postMethod != null) { + try { + postMethod.releaseConnection(); + } catch (Exception e) { + e.printStackTrace(); + } + } + if (httpClient != null) { + try { + ((SimpleHttpConnectionManager) httpClient.getHttpConnectionManager()).shutdown(); + } catch (Exception e) { + e.printStackTrace(); + } + httpClient = null; + } + } + return result; + } + + public String getRequestUrl(){ + return PropertiesUtil.get("url"); + } + + public String getRequestParam() throws Exception { + return transformXMLtoParam(this.code,this.getRequestXML()); + } + + public String getAppCode() { + return appCode; + } + + public void setAppCode(String appCode) { + this.appCode = appCode; + } + + public String getAppName() { + return appName; + } + + public void setAppName(String appName) { + this.appName = appName; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getBusiNo() { + return busiNo; + } + + public void setBusiNo(String busiNo) { + this.busiNo = busiNo; + } +} diff --git a/src/com/ample/icms/util/PropertiesUtil.java b/src/com/ample/icms/util/PropertiesUtil.java new file mode 100644 index 000000000..cace56276 --- /dev/null +++ b/src/com/ample/icms/util/PropertiesUtil.java @@ -0,0 +1,38 @@ +package com.ample.icms.util; + +import com.amarsoft.are.ARE; + + +import java.io.IOException; +import java.util.Map; +import java.util.Properties; +import java.util.concurrent.ConcurrentHashMap; + +public class PropertiesUtil { + private static Map attributes; + + public static void load() { + attributes = new ConcurrentHashMap(); + Properties prop = new Properties(); + try { + prop.load(PropertiesUtil.class.getResourceAsStream("/icms.properties")); + for(Map.Entry entry : prop.entrySet()) { + if(entry.getKey() == null || entry.getValue() == null) { + continue; + } + attributes.put(entry.getKey().toString(), entry.getValue().toString()); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + public static void destroy() { + if(attributes != null) attributes.clear(); + } + + public static String get(String propName) { + if(attributes == null) load(); + return attributes.get(propName); + } +} diff --git a/src_core/com/tenwa/util/test.java b/src_core/com/tenwa/util/test.java index 750066547..36807e4e3 100644 --- a/src_core/com/tenwa/util/test.java +++ b/src_core/com/tenwa/util/test.java @@ -1,31 +1,133 @@ package com.tenwa.util; -import com.tenwa.flow.treeview.action.BaseInitTreeView; +import com.ample.icms.query.*; +import com.sunyard.insurance.ecm.socket.client.AutoScanApi; +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.HttpException; +import org.apache.commons.httpclient.HttpStatus; +import org.apache.commons.httpclient.SimpleHttpConnectionManager; +import org.apache.commons.httpclient.methods.PostMethod; +import org.dom4j.Attribute; +import org.dom4j.Document; +import org.dom4j.DocumentException; +import org.dom4j.Element; +import org.dom4j.io.SAXReader; -import jbo.app.tenwa.doc.LB_DOCATTRIBUTE; -import jbo.app.tenwa.doc.LB_DOCRELATIVE; +import java.io.File; +import java.io.IOException; +import java.util.Iterator; +import java.util.List; public class test { + public static void main(String[] args){ + String zipPath = "C:/Users/ivanl/Desktop/11111.zip"; + try { + // " sunyard#licenseKey" ：sunyard为接入系统ID，licenseKey为接入系统授权密钥 + AutoScanApi autoScanApi = new AutoScanApi("192.168.7.71",8088,"anpeng#IU2VHdejDpUFzhoeT7tUSII3"); +// // "10I" : 业务类型 +// // zipPath ：要上传批次文件的zip包的路径 +// // returnMsg ： 第三方上传的返回状态 + String returnMsg = autoScanApi.ScanImageFile("BQCW-000010", zipPath); + System.out.println(returnMsg); + } catch (Exception e) { + e.printStackTrace(); + } + } + public static void main1(String[] args) { + ImageQuery query = new ImageQuery(); + query.setAppCode("BQCW-000010"); + query.setAppName("业务申请"); + query.setBusiNo("FBO2022031100000001"); + query.setCode("ECM0013"); - public static void main(String[] args) { - String sql = "select se.seriesid,se.seriesname from (" - + "SELECT seriesid,max(seriesname) seriesname,max(brandid) brandid FROM vi_car_data where 1=1 group by seriesid" - + ") se WHERE se.seriesname IS NOT NULL AND se.brandid='#brandid' ORDER BY se.seriesname DESC"; - - System.out.println(sql.substring(sql.toUpperCase().lastIndexOf("WHERE"), sql.length())); - System.out.println(sql.substring(0, sql.toLowerCase().lastIndexOf("where"))); - - - sql = "SELECT DISTINCT O.ID, O.DOC_NAME,r.id " + "FROM O, " - + LB_DOCRELATIVE.CLASS_NAME + " R " - + "WHERE O.RELATIVE_ID = R.ID " - + "AND O.ID NOT IN (SELECT A.LIBRARY_ID FROM " - + LB_DOCATTRIBUTE.CLASS_NAME + " A) " - + "AND R.ObjectType='BusinessApplyFlow' and R.proj_id=:projid " + "AND o.DOC_NATURE='01' " - + "ORDER BY SERIAL_NUM"; - - System.out.println(sql); - + String result=""; + PostMethod postMethod = null; + HttpClient httpClient = null; + try { + String param =query.getRequestParam(); + System.out.println("加密后数据:"+param); + postMethod = new PostMethod("http://192.168.7.71:8081/SunICMS/servlet/RouterServlet"); + // 设置格式 + postMethod.getParams().setContentCharset("UTF-8"); + postMethod.setParameter("data", param); + postMethod.setRequestHeader("Referer", "http://172.16.20.212/imaging"); + httpClient = new HttpClient(); + // 执行postMethod + int statusCode = httpClient.executeMethod(postMethod); + System.out.println("结果状态："+statusCode); + if (statusCode == HttpStatus.SC_OK) { + byte[] bodydata = postMethod.getResponseBody(); + //取得返回值 + result = new String(bodydata, "UTF-8"); + System.out.println("结果" + result); + } else { + } + }catch (HttpException e) { + //协议发生异常，URL不合法请检查URL！ + e.printStackTrace(); + } catch (IOException e) { + //请检查网络是否通畅，检查网线是否插好！ + e.printStackTrace(); + } catch(Exception e){ + e.printStackTrace(); + }finally { + if (postMethod != null) { + try { + postMethod.releaseConnection(); + } catch (Exception e) { + e.printStackTrace(); + } + } + if (httpClient != null) { + try { + ((SimpleHttpConnectionManager) httpClient.getHttpConnectionManager()).shutdown(); + } catch (Exception e) { + e.printStackTrace(); + } + httpClient = null; + } + } } + + // private static ArrayList bookList = new ArrayList(); + + public static void dom4j() { + // 解析books.xml文件 + // 创建SAXReader的对象reader + SAXReader reader = new SAXReader(); + try { + // 通过reader对象的read方法加载books.xml文件,获取docuemnt对象。 + Document document = reader.read(new File("src/res/books.xml")); + // 通过document对象获取根节点bookstore + Element bookStore = document.getRootElement(); + // 通过element对象的elementIterator方法获取迭代器 + Iterator it = bookStore.elementIterator(); + // 遍历迭代器，获取根节点中的信息（书籍） + while (it.hasNext()) { + System.out.println("=====开始遍历某一本书====="); + Element book = (Element) it.next(); + // 获取book的属性名以及 属性值 + List bookAttrs = book.attributes(); + for (Attribute attr : bookAttrs) { + System.out.println("属性名：" + attr.getName() + "--属性值：" + + attr.getValue()); + } + Iterator itt = book.elementIterator(); + while (itt.hasNext()) { + Element bookChild = (Element) itt.next(); + System.out.println("节点名：" + bookChild.getName() + "--节点值：" + bookChild.getStringValue()); + } + System.out.println("=====结束遍历某一本书====="); + } + } catch (DocumentException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + + + + } From d191cd805ad5807d69bfdd6d2c1a284754d55174 Mon Sep 17 00:00:00 2001 From: "zhanglei@ap-leasing.com.cn" Date: Mon, 21 Mar 2022 13:07:12 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=EF=BC=8C=E5=BD=93=E5=8F=AF=E9=80=89?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=8F=AA=E5=89=A9=E4=B8=80=E4=BA=BA=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Common/WorkFlow/FlowSubmitDialog.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp b/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp index dd6367e1c..262397018 100644 --- a/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp +++ b/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp @@ -219,9 +219,9 @@ }else{ actionSet.hide(); }*/ - if(vUser.length==1){ + /*if(vUser.length==1){ actionSet.hide(); - } + }*/ } }else{ actionSet.html(""); From b41242fd31abede188abaeececedd6f252f4b8ae Mon Sep 17 00:00:00 2001 From: "zhanglei@ap-leasing.com.cn" Date: Fri, 15 Apr 2022 18:14:16 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comm/LBContract/LBContractPrintList.jsp | 9 +++- .../BusinessProjectTempInfo.jsp | 7 ++- config/icms.properties | 1 + src/com/ample/icms/bean/ImageBaseData.java | 4 +- src/com/ample/icms/scan/ImageUpload.java | 46 +++++++++++++++---- src/com/ample/icms/service/ImageService.java | 3 +- 6 files changed, 55 insertions(+), 15 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp index 99912da0d..bbd7241f5 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp @@ -44,6 +44,7 @@ {btnflag,"","Button","查询签约结果","查询签约结果","getStatus()","","","","btn_icon_obtain",""}, {btnflag,"","Button","重新发送短信","重新发送短信","sendMessageAgain()","","","","btn_icon_refresh",""}, {signs,"","Button","公司盖章","公司盖章","sign()","","","","btn_icon_refresh",""}, + {"true","","Button","上传合同","上传合同","uploadContract()","","","","btn_icon_refresh",""}, }; %><%@include file="/Frame/resources/include/ui/include_list.jspf"%> <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/config/icms.properties b/config/icms.properties index 1c033e0ae..cb48e8719 100644 --- a/config/icms.properties +++ b/config/icms.properties @@ -1,4 +1,5 @@ url=http://192.168.7.71:8081/SunICMS/servlet/RouterServlet +service_ip=192.168.7.71 #链接有效时间，单位为秒 useful_life=360 #业务系统授权密钥 diff --git a/src/com/ample/icms/bean/ImageBaseData.java b/src/com/ample/icms/bean/ImageBaseData.java index 9a47be8c2..bdce5f6d7 100644 --- a/src/com/ample/icms/bean/ImageBaseData.java +++ b/src/com/ample/icms/bean/ImageBaseData.java @@ -22,10 +22,10 @@ public class ImageBaseData { //操作员角色 @XStreamAlias("ROLE_CODE") private String roleCode; - //操作员角色 + //批量扫描标记 0-批量，1-单笔 @XStreamAlias("ONE_BATCH") private String oneBatch; - //操作员角色 + //操作类型 1新增，0修改 @XStreamAlias("NEW_BATCH") private String newBatch; diff --git a/src/com/ample/icms/scan/ImageUpload.java b/src/com/ample/icms/scan/ImageUpload.java index 4e7023d75..39dfa2973 100644 --- a/src/com/ample/icms/scan/ImageUpload.java +++ b/src/com/ample/icms/scan/ImageUpload.java @@ -1,20 +1,50 @@ package com.ample.icms.scan; +import com.amarsoft.awe.util.SqlObject; +import com.amarsoft.awe.util.Transaction; +import com.ample.icms.service.ImageService; +import com.ample.icms.util.PropertiesUtil; import com.sunyard.insurance.ecm.socket.client.AutoScanApi; -public class ImageUpload { +public class ImageUpload extends ImageService { + private String zipPath ; + public void doUpload(){ String zipPath = "C:/Users/ivanl/Desktop/影像系统/ECM4.0Demo/ECM4.0Demo/第三方上传/1111.zip"; try { - // " sunyard#licenseKey" ：sunyard为接入系统ID，licenseKey为接入系统授权密钥 - AutoScanApi autoScanApi = new AutoScanApi("192.168.7.71",8081,"anpeng#IU2VHdejDpUFzhoeT7tUSII3"); -// // "10I" : 业务类型 -// // zipPath ：要上传批次文件的zip包的路径 -// // returnMsg ： 第三方上传的返回状态 - String returnMsg = autoScanApi.ScanImageFile("FBO2022031100000001", zipPath); - System.out.println(returnMsg); + AutoScanApi autoScanApi = new AutoScanApi(PropertiesUtil.get("service_ip"),8088,PropertiesUtil.get("secret_id")+"#"+PropertiesUtil.get("secret_key")); + String result = autoScanApi.ScanImageFile(appCode, zipPath); + String returnCode = result.substring(0,result.indexOf("@")); + String returnMsg = result.substring(result.indexOf("@")+1,result.length()+1); + intoLog(returnCode,returnMsg); } catch (Exception e) { e.printStackTrace(); } } + public void intoLog(String code ,String msg) { + Transaction transaction = null; + Transaction.createTransaction("als"); + SqlObject so = null; + try { + so = new SqlObject("insert into icms_upload_log (id,flowunid,path,code,msg,inputtime) values ()"); + transaction.executeSQL(so); + transaction.commit(); + } catch (Exception e) { + e.printStackTrace(); + } + + } + + public void upload(){ + /** + * 1.找出需要上传的影像 + * 2.复制到指定路径 + * 3.在指定路径添加对应xml文件 + * 4.打包上传 + * 5.删除复制文件和打包文件 + */ + } + public void copyFile(){ + + } } diff --git a/src/com/ample/icms/service/ImageService.java b/src/com/ample/icms/service/ImageService.java index 1fb2f7c5c..8d2d4c6ec 100644 --- a/src/com/ample/icms/service/ImageService.java +++ b/src/com/ample/icms/service/ImageService.java @@ -58,6 +58,7 @@ public class ImageService { XStream xs = new XStream(); xs.processAnnotations(ImageRoot.class); String xml = xs.toXML(createData()); + //XStream的老毛病，转译会将_转成__,所以在这里转回来 xml = xml.replace("__","_"); xml = "\n" + xml; logger.info("\n"+xml+"\n"); @@ -86,7 +87,7 @@ public class ImageService { httpClient = new HttpClient(); // 执行postMethod int statusCode = httpClient.executeMethod(postMethod); - System.out.println("结果状态："+statusCode); + System.out.println("结果状态码："+statusCode); if (statusCode == HttpStatus.SC_OK) { byte[] bodydata = postMethod.getResponseBody(); //取得返回值 From afa0e6ffc035cb9374599f47f5771074b16f4c00 Mon Sep 17 00:00:00 2001 From: "zhanglei@ap-leasing.com.cn" Date: Sun, 24 Apr 2022 18:01:46 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=BC=80=E5=8F=91(2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessProjectTempInfo.jsp | 2 +- config/icms.properties | 3 + src/com/ample/icms/scan/ImageDownload.java | 171 ++++++++++++++++++ src/com/ample/icms/scan/ImageUpload.java | 79 +++++++- .../flow/tabviewservice/FlowTaskViewTab.java | 2 +- .../exportcallback/impl/ZipUtils.java | 19 ++ 6 files changed, 269 insertions(+), 7 deletions(-) create mode 100644 src/com/ample/icms/scan/ImageDownload.java diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp index 378430951..f39e39a8f 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp @@ -184,7 +184,7 @@ return url; } function getRequestParam(){ - let appCode = 'BQCW-000010'; + let appCode = 'BQCWHZ36_7'; let appName = '业务申请'; let code = 'ECM0002'; if(("<%=sPhaseNo%>"=="0010") && ("<%=FlowNo%>"=="BusinessApplyFlow" || "<%=FlowNo%>" == "BusinessChangeFlow")){ diff --git a/config/icms.properties b/config/icms.properties index cb48e8719..e51f648c9 100644 --- a/config/icms.properties +++ b/config/icms.properties @@ -5,4 +5,7 @@ useful_life=360 #业务系统授权密钥 secret_id=anpeng secret_key=IU2VHdejDpUFzhoeT7tUSII3 +#影像第三方上传时打包临时文件路径 +fileSavePathTemp=D:/data/files/icmsFileTemp + diff --git a/src/com/ample/icms/scan/ImageDownload.java b/src/com/ample/icms/scan/ImageDownload.java new file mode 100644 index 000000000..faf4582ce --- /dev/null +++ b/src/com/ample/icms/scan/ImageDownload.java @@ -0,0 +1,171 @@ +package com.ample.icms.scan; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.util.SqlObject; +import com.amarsoft.awe.util.Transaction; +import com.ample.icms.service.ImageService; +import com.ample.icms.util.PropertiesUtil; +import com.sunyard.insurance.ecm.socket.client.AutoScanApi; +import com.sunyard.insurance.encode.client.EncodeAccessParam; +import com.tenwa.officetempalte.exportcallback.impl.ZipUtils; +import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST; +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.HttpException; +import org.apache.commons.httpclient.HttpStatus; +import org.apache.commons.httpclient.SimpleHttpConnectionManager; +import org.apache.commons.httpclient.methods.PostMethod; +import org.dom4j.Document; +import org.dom4j.DocumentException; +import org.dom4j.io.OutputFormat; +import org.dom4j.io.SAXReader; +import org.dom4j.io.XMLWriter; + +import java.io.*; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; + +public class ImageDownload extends ImageService { + private String zipPath ; + private String projectId; + private String flowUnid; + private String fileSavePath; + public static String testBatchDownload () throws Exception { + //准备参数 + StringBuilder sb = new StringBuilder("xml=交互参数xml字符串&code=ECM0009&format=xml"); + String param = EncodeAccessParam.getEncodeParam(sb.toString(),300, PropertiesUtil.get("secret_key")); + String result=""; + PostMethod postMethod = null; + HttpClient httpClient = null; + try{ + postMethod = new PostMethod(PropertiesUtil.get("url")); + // 设置格式 + postMethod.getParams().setContentCharset("UTF-8"); + postMethod.setParameter("data", param); + postMethod.setRequestHeader("Referer", "http://172.16.20.212/imaging"); + httpClient = new HttpClient(); + // 执行postMethod + int statusCode = httpClient.executeMethod(postMethod); + if(statusCode== HttpStatus.SC_OK){ + byte[] bodydata = postMethod.getResponseBody(); + //取得返回值 + result = new String(bodydata, "UTF-8"); + }else{ + } + }catch (HttpException e) { + //协议发生异常，URL不合法请检查URL！ + } catch (IOException e) { + //请检查网络是否通畅，检查网线是否插好！ + } catch(Exception e){ + + }finally { + if (postMethod != null) { + try { + postMethod.releaseConnection(); + } catch (Exception e) { + } + } + if (httpClient != null) { + try { + ((SimpleHttpConnectionManager) httpClient.getHttpConnectionManager()).shutdown(); + } catch (Exception e) { + } + httpClient = null; + } + } + return result; + } + + public void doUpload(){ + // String zipPath = "C:/Users/ivanl/Desktop/影像系统/ECM4.0Demo/ECM4.0Demo/第三方上传/1111.zip"; + String zipPath = PropertiesUtil.get("fileSavePathTemp")+"/"+flowUnid+".zip"; + try { + AutoScanApi autoScanApi = new AutoScanApi(PropertiesUtil.get("service_ip"),8088,PropertiesUtil.get("secret_id")+"#"+PropertiesUtil.get("secret_key")); + String result = autoScanApi.ScanImageFile(appCode, zipPath); + String returnCode = result.substring(0,result.indexOf("@")); + String returnMsg = result.substring(result.indexOf("@")+1,result.length()+1); + intoLog(returnCode,returnMsg); + } catch (Exception e) { + e.printStackTrace(); + } + } + public void intoLog(String code ,String msg) { + Transaction transaction = null; + Transaction.createTransaction("als"); + SqlObject so = null; + try { + so = new SqlObject("insert into icms_upload_log (id,flowunid,path,code,msg,inputtime) values ()"); + transaction.executeSQL(so); + transaction.commit(); + } catch (Exception e) { + e.printStackTrace(); + } + + } + + public void upload() throws JBOException, FileNotFoundException { + /** + * 1.找出需要上传的影像 + * 3.在指定路径添加对应xml文件 + * 4.打包上传 + * 5.删除复制文件和打包文件 + */ + FileOutputStream fos = new FileOutputStream(new File(PropertiesUtil.get("fileSavePathTemp")+"/"+flowUnid+".zip")); + ZipUtils zdo = new ZipUtils(); + zdo.toZip(copyFile(),fos); + } + + /** + * 上传成功后再删除 + */ + public void deleteTemp(){ + File f = new File(PropertiesUtil.get("fileSavePathTemp")); + if(f.length()!=0){ + ZipUtils zdo = new ZipUtils(); + zdo.deleteFile(f,false); + } + } + public List copyFile() throws JBOException { + List files = new ArrayList<>(); + BizObjectManager bom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME); + List bos = bom.createQuery("sign_type='COMPLETE' and file_flag='yes' and project_id=:projectId and flow_unid=:flowUnid") + .setParameter("projectId",projectId).setParameter("flowUnid",flowUnid).getResultList(false); + for(BizObject bo : bos){ + String filePath = bo.getAttribute("fullpath").toString(); + File file = new File(filePath); + files.add(file); + } + //todo 加上xml文件 + createXMl(); + File fileXML = new File("xmlpath"); + files.add(fileXML); + return files; + } + public void createXMl() { + String appCode = "BQCW-000010"; + String appName = "签约文件"; + this.setAppCode(appCode); + this.setAppName(appName); + this.setBusiNo(flowUnid); + String xml = getRequestXML(); + SAXReader saxReader = new SAXReader(); + Document document; + try { + document = saxReader.read(new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8))); + OutputFormat format = OutputFormat.createPrettyPrint(); + format.setEncoding("UTF-8"); + XMLWriter writer = new XMLWriter(new FileWriter(new File(PropertiesUtil.get("fileSavePathTemp")+"/"+flowUnid+".xml")),format); + writer.write(document); + writer.close(); + } catch (DocumentException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + + } + +} diff --git a/src/com/ample/icms/scan/ImageUpload.java b/src/com/ample/icms/scan/ImageUpload.java index 39dfa2973..74a7c5e93 100644 --- a/src/com/ample/icms/scan/ImageUpload.java +++ b/src/com/ample/icms/scan/ImageUpload.java @@ -1,16 +1,35 @@ package com.ample.icms.scan; +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.awe.util.SqlObject; import com.amarsoft.awe.util.Transaction; import com.ample.icms.service.ImageService; import com.ample.icms.util.PropertiesUtil; import com.sunyard.insurance.ecm.socket.client.AutoScanApi; +import com.tenwa.officetempalte.exportcallback.impl.ZipUtils; +import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST; +import org.dom4j.Document; +import org.dom4j.DocumentException; +import org.dom4j.io.OutputFormat; +import org.dom4j.io.SAXReader; +import org.dom4j.io.XMLWriter; + +import java.io.*; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; public class ImageUpload extends ImageService { private String zipPath ; - + private String projectId; + private String flowUnid; + private String fileSavePath; public void doUpload(){ - String zipPath = "C:/Users/ivanl/Desktop/影像系统/ECM4.0Demo/ECM4.0Demo/第三方上传/1111.zip"; + // String zipPath = "C:/Users/ivanl/Desktop/影像系统/ECM4.0Demo/ECM4.0Demo/第三方上传/1111.zip"; + String zipPath = PropertiesUtil.get("fileSavePathTemp")+"/"+flowUnid+".zip"; try { AutoScanApi autoScanApi = new AutoScanApi(PropertiesUtil.get("service_ip"),8088,PropertiesUtil.get("secret_id")+"#"+PropertiesUtil.get("secret_key")); String result = autoScanApi.ScanImageFile(appCode, zipPath); @@ -35,16 +54,66 @@ public class ImageUpload extends ImageService { } - public void upload(){ + public void upload() throws JBOException, FileNotFoundException { /** * 1.找出需要上传的影像 - * 2.复制到指定路径 * 3.在指定路径添加对应xml文件 * 4.打包上传 * 5.删除复制文件和打包文件 */ + FileOutputStream fos = new FileOutputStream(new File(PropertiesUtil.get("fileSavePathTemp")+"/"+flowUnid+".zip")); + ZipUtils zdo = new ZipUtils(); + zdo.toZip(copyFile(),fos); } - public void copyFile(){ + + /** + * 上传成功后再删除 + */ + public void deleteTemp(){ + File f = new File(PropertiesUtil.get("fileSavePathTemp")); + if(f.length()!=0){ + ZipUtils zdo = new ZipUtils(); + zdo.deleteFile(f,false); + } + } + public List copyFile() throws JBOException { + List files = new ArrayList<>(); + BizObjectManager bom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME); + List bos = bom.createQuery("sign_type='COMPLETE' and file_flag='yes' and project_id=:projectId and flow_unid=:flowUnid") + .setParameter("projectId",projectId).setParameter("flowUnid",flowUnid).getResultList(false); + for(BizObject bo : bos){ + String filePath = bo.getAttribute("fullpath").toString(); + File file = new File(filePath); + files.add(file); + } + //todo 加上xml文件 + createXMl(); + File fileXML = new File("xmlpath"); + files.add(fileXML); + return files; + } + public void createXMl() { + String appCode = "BQCW-000010"; + String appName = "签约文件"; + this.setAppCode(appCode); + this.setAppName(appName); + this.setBusiNo(flowUnid); + String xml = getRequestXML(); + SAXReader saxReader = new SAXReader(); + Document document; + try { + document = saxReader.read(new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8))); + OutputFormat format = OutputFormat.createPrettyPrint(); + format.setEncoding("UTF-8"); + XMLWriter writer = new XMLWriter(new FileWriter(new File(PropertiesUtil.get("fileSavePathTemp")+"/"+flowUnid+".xml")),format); + writer.write(document); + writer.close(); + } catch (DocumentException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } } + } diff --git a/src_core/com/tenwa/flow/tabviewservice/FlowTaskViewTab.java b/src_core/com/tenwa/flow/tabviewservice/FlowTaskViewTab.java index a1527c2ad..3bfb092ff 100644 --- a/src_core/com/tenwa/flow/tabviewservice/FlowTaskViewTab.java +++ b/src_core/com/tenwa/flow/tabviewservice/FlowTaskViewTab.java @@ -114,7 +114,7 @@ public class FlowTaskViewTab { BizObjectManager bm = null; BizObjectQuery bq = null; bm = JBOFactory.getFactory().getManager(OBJECTTYPE_RELA.CLASS_NAME); - bq = bm.createQuery("O.OBJECTTYPE=:OBJECTTYPE order by O.sortno ").setParameter("OBJECTTYPE", this.getObjectType()); + bq = bm.createQuery("O.OBJECTTYPE=:OBJECTTYPE and isinuse='Y' order by O.sortno ").setParameter("OBJECTTYPE", this.getObjectType()); this.viewTabItemList=bq.getResultList(true); diff --git a/src_core/com/tenwa/officetempalte/exportcallback/impl/ZipUtils.java b/src_core/com/tenwa/officetempalte/exportcallback/impl/ZipUtils.java index b592cf674..ac11ee347 100644 --- a/src_core/com/tenwa/officetempalte/exportcallback/impl/ZipUtils.java +++ b/src_core/com/tenwa/officetempalte/exportcallback/impl/ZipUtils.java @@ -154,5 +154,24 @@ public class ZipUtils { } f.delete();//最后删除该目录中所有文件后就删除该目录 } + + /** + * + * @param f + * @param deleteRoot true连当前目录一块删除，false，只删除当前目录下面的文件 + */ + public void deleteFile(File f ,boolean deleteRoot){ + File [] b = f.listFiles();//获取包含file对象对应的子目录或者文件 + for(int i =0;i Date: Tue, 10 May 2022 11:10:51 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=B5=8B=E8=AF=95=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E5=88=9D=E6=AD=A5=E6=B5=8B=E8=AF=95=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comm/LBContract/LBContractPrintList.jsp | 7 +- .../LBContractPersonBaseInfo.jsp | 64 +++++++++++--- .../MortgageFile/LbContactInfo.jsp | 48 +++++++++++ .../BusinessProjectTempInfo.jsp | 24 +++--- .../CautionMoneyDeduction/ContractInfoPay.jsp | 47 ++++++++++ config/icms.properties | 8 +- src/com/ample/icms/check/ImageCheck.java | 4 +- src/com/ample/icms/init/IcmsRelationInit.java | 31 +++++++ src/com/ample/icms/scan/ImageUpload.java | 86 ++++++++++++++----- src/com/ample/icms/service/ImageService.java | 13 ++- src/com/ample/icms/util/GetInfoUtil.java | 81 +++++++++++++++++ .../project/commcheck/IcmsDocListCheck.java | 28 ++++++ 12 files changed, 380 insertions(+), 61 deletions(-) create mode 100644 src/com/ample/icms/init/IcmsRelationInit.java create mode 100644 src/com/ample/icms/util/GetInfoUtil.java create mode 100644 src_tenwa/com/tenwa/lease/flow/project/commcheck/IcmsDocListCheck.java diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp index bbd7241f5..e5d249bac 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp @@ -12,6 +12,7 @@ String contractNumber = CurPage.getParameter("ContractNumber"); String productId = CurPage.getParameter("ProductId"); String flowunid = CurPage.getParameter("FlowUnid"); + String FlowNo=CurPage.getParameter("FlowNo"); String action = CurPage.getParameter("action"); String SubjectId=CurPage.getParameter("SubjectId");//获取主体ID String operationType = CurPage.getParameter("operationType"); @@ -54,9 +55,9 @@ <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbContactInfo.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbContactInfo.jsp index 256e9b61e..12f63e730 100644 --- a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbContactInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbContactInfo.jsp @@ -6,6 +6,9 @@ History Log: */ String sPrevUrl = CurPage.getParameter("PrevUrl"); + String sFlowUnid = CurPage.getParameter("FlowUnid"); + String sPhaseNo=CurPage.getParameter("PhaseNo");//阶段号 + String FlowNo=CurPage.getParameter("FlowNo");//流程名称 if(sPrevUrl == null) sPrevUrl = ""; String sTempletNo = "LbContactInfo";//--模板号-- @@ -19,6 +22,7 @@ String sButtons[][] = { //{"true","All","Button","保存","保存所有修改","as_save(0)","","","",""}, //{String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""} + {"true","","Button","资料清单","资料清单","openFileList()","","","","btn_icon_saveNew",""}, }; //sButtonPosition = "south"; %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> @@ -38,5 +42,49 @@ function returnList(){ AsControl.OpenView("<%=sPrevUrl%>", "","_self",""); } + function openFileList(){ + let url = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestUrl",""); + let params = getRequestParam(); + if(params!=null){ + post(url,params); + } + } + function getRequestParam(){ + let appInfo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getAppCodeByContract", "flowUnid=<%=sFlowUnid%>,flowNo=<%=FlowNo%>"); + let index = appInfo.indexOf("@"); + if(index==-1){ + alert(appInfo); + return; + } + let appCode = appInfo.substr(0,index-1); + let appName = appInfo.substr(index+1,appInfo.length); + let code = 'ECM0002'; + if("<%=sPhaseNo%>"=="0010"){ + code = 'ECM0001'; + } + let busiNo = '<%=sFlowUnid%>'; + let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo); + return param; + } + /** + * 考虑防止一些浏览器的弹窗被阻止，不用ajax，而是用form表单提交的方式 + * @param URL + * @param PARAMS + */ + function post(URL, param) { + let temp_form = document.createElement("form"); + temp_form.action = URL; + temp_form.target = "_blank"; + temp_form.method = "post"; + temp_form.style.display = "none"; + + let opt = document.createElement("textarea"); + opt.name = 'data'; + opt.value = param; + temp_form.appendChild(opt); + + document.body.appendChild(temp_form); + temp_form.submit(); + } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp index f39e39a8f..07d011c7f 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp @@ -16,7 +16,6 @@ String compClientID = CurPage.getParameter("CompClientID"); String rightType = CurPage.getParameter("RightType"); String sTempletNo = "BusinessProjectTempInfo";//--模板号-- - BizObject bo=JBOFactory.createBizObjectQuery("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT", "flow_unid=:flowunid").setParameter("flowunid",sFlowUnid).getSingleResult(false); String custype = CurPage.getParameter("CustomerType"); String customertype = CurPage.getParameter("customertype"); String channel = CurPage.getParameter("channel"); @@ -59,7 +58,7 @@ dwTemp.replaceColumn("customer_info", "", CurPage.getObjectWindowOutput()); String sButtons[][] = { {"ReadOnly".equals(rightType)?"false":"true","","Button","保存","保存","save()","","","","btn_icon_saveNew",""}, - {"ReadOnly".equals(rightType)?"false":"true","","Button","资料清单","资料清单","openFileList()","","","","btn_icon_saveNew",""}, + {"true","","Button","资料清单","资料清单","openFileList()","","","","btn_icon_saveNew",""}, {"true","","Button","产品信息","产品信息","product()","","","","btn_icon_saveNew",""} }; @@ -175,17 +174,22 @@ } function openFileList(){ - let url = getRequestUrl(); - let params = getRequestParam(); - post(url,params); - } - function getRequestUrl(){ let url = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestUrl",""); - return url; + let params = getRequestParam(); + if(params!=null){ + post(url,params); + } } function getRequestParam(){ - let appCode = 'BQCWHZ36_7'; - let appName = '业务申请'; + debugger; + let appInfo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getAppCodeByProject", "flowUnid=<%=sFlowUnid%>,flowNo=<%=FlowNo%>"); + let index = appInfo.indexOf("@"); + if(index==-1){ + alert(appInfo); + return; + } + let appCode = appInfo.substr(0,index); + let appName = appInfo.substr(index+1,appInfo.length); let code = 'ECM0002'; if(("<%=sPhaseNo%>"=="0010") && ("<%=FlowNo%>"=="BusinessApplyFlow" || "<%=FlowNo%>" == "BusinessChangeFlow")){ code = 'ECM0001'; diff --git a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp index 05ca0d6df..52f7e7516 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp @@ -9,6 +9,7 @@ String orgId = CurUser.getOrgID(); String ishistory = CurPage.getParameter("IsHistory"); String flowunid = CurPage.getParameter("FlowUnid"); + String FlowNo=CurPage.getParameter("FlowNo"); String contractId = CurPage.getParameter("ContractId"); String compClientID = CurPage.getParameter("CompClientID"); String phaseNo = CurPage.getParameter("PhaseNo"); @@ -51,6 +52,7 @@ String sButtons[][] ={ {"true","","Button","保存","保存所有修改","save()","","","","btn_icon_save"}, {"true","All","Button","查看GPS定位信息","查看GPS定位信息","queryOrder()","","","","",""}, + {"true","","Button","资料清单","资料清单","openFileList()","","","","btn_icon_saveNew",""}, }; //sButtonPosition = "south"; %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> @@ -167,5 +169,50 @@ window.onload = function(){ $("#A_div_1038").attr("style","display:none;"); } } + + function openFileList(){ + let url = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestUrl",""); + let params = getRequestParam(); + if(params!=null){ + post(url,params); + } + } + function getRequestParam(){ + let appInfo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getAppCodeByContract", "flowUnid=<%=flowunid%>,flowNo=<%=FlowNo%>"); + let index = appInfo.indexOf("@"); + if(index==-1){ + alert(appInfo); + return; + } + let appCode = appInfo.substr(0,index-1); + let appName = appInfo.substr(index+1,appInfo.length); + let code = 'ECM0002'; + if("<%=phaseNo%>"=="0010"){ + code = 'ECM0001'; + } + let busiNo = '<%=flowunid%>'; + let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo); + return param; + } + /** + * 考虑防止一些浏览器的弹窗被阻止，不用ajax，而是用form表单提交的方式 + * @param URL + * @param PARAMS + */ + function post(URL, param) { + let temp_form = document.createElement("form"); + temp_form.action = URL; + temp_form.target = "_blank"; + temp_form.method = "post"; + temp_form.style.display = "none"; + + let opt = document.createElement("textarea"); + opt.name = 'data'; + opt.value = param; + temp_form.appendChild(opt); + + document.body.appendChild(temp_form); + temp_form.submit(); + } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/config/icms.properties b/config/icms.properties index e51f648c9..c2e4e76f0 100644 --- a/config/icms.properties +++ b/config/icms.properties @@ -1,11 +1,11 @@ url=http://192.168.7.71:8081/SunICMS/servlet/RouterServlet service_ip=192.168.7.71 -#链接有效时间，单位为秒 +#\u94FE\u63A5\u6709\u6548\u65F6\u95F4\uFF0C\u5355\u4F4D\u4E3A\u79D2 useful_life=360 -#业务系统授权密钥 +#\u4E1A\u52A1\u7CFB\u7EDF\u6388\u6743\u5BC6\u94A5 secret_id=anpeng secret_key=IU2VHdejDpUFzhoeT7tUSII3 -#影像第三方上传时打包临时文件路径 -fileSavePathTemp=D:/data/files/icmsFileTemp +#\u5F71\u50CF\u7B2C\u4E09\u65B9\u4E0A\u4F20\u65F6\u6253\u5305\u4E34\u65F6\u6587\u4EF6\u8DEF\u5F84 +fileSavePathTemp=/Users/simba/data/files/icmsFileTemp diff --git a/src/com/ample/icms/check/ImageCheck.java b/src/com/ample/icms/check/ImageCheck.java index 806ae5dde..d8588cd4f 100644 --- a/src/com/ample/icms/check/ImageCheck.java +++ b/src/com/ample/icms/check/ImageCheck.java @@ -3,7 +3,8 @@ package com.ample.icms.check; import com.ample.icms.service.ImageService; public class ImageCheck extends ImageService { - public void getResult(){ + public String getResult(){ + this.setCode("ECM0013"); String result = doPost(); if(result.contains("200")){ //true @@ -12,5 +13,6 @@ public class ImageCheck extends ImageService { }else{ //false } + return result; } } diff --git a/src/com/ample/icms/init/IcmsRelationInit.java b/src/com/ample/icms/init/IcmsRelationInit.java new file mode 100644 index 000000000..1cde1f3f3 --- /dev/null +++ b/src/com/ample/icms/init/IcmsRelationInit.java @@ -0,0 +1,31 @@ +package com.ample.icms.init; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.awe.util.ASResultSet; +import com.amarsoft.awe.util.SqlObject; +import com.amarsoft.awe.util.Transaction; +import com.tenwa.flow.baseBussion.BaseBussiness; +import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP; + +public class IcmsRelationInit extends BaseBussiness { + @Override + public Object run(Transaction Sqlca) throws Exception { + JBOTransaction tx = Sqlca.getTransaction(); + BizObject boLPIT = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME,tx).createQuery("flowunid=:flowunid").setParameter("flowunid",this.getAttribute("ObjectNo").toString()).getSingleResult(false); + String projectNo = boLPIT.getAttribute("project_no").toString(); + String productId = boLPIT.getAttribute("product_id").toString(); + SqlObject sql_icms = new SqlObject("select flown,app_code,app_name from icms_prd_rela where productid='"+productId+"' group by flown,app_code"); + ASResultSet rs = Sqlca.getASResultSet(sql_icms); + while (rs.next()){ + String flowNo = rs.getString("flown"); + String appCode = rs.getString("app_code"); + String appName = rs.getString("app_name"); + SqlObject sql_rela = new SqlObject("insert into icms_rela (id,project_no,flow_no,app_code,app_name) values(REPLACE(UUID(), '-', ''),'"+projectNo+"','"+flowNo+"','"+appCode+"','"+appName+"')"); + Sqlca.executeSQL(sql_rela); + } + String sMessage="true"; + return sMessage; + } +} diff --git a/src/com/ample/icms/scan/ImageUpload.java b/src/com/ample/icms/scan/ImageUpload.java index 74a7c5e93..0c42d7858 100644 --- a/src/com/ample/icms/scan/ImageUpload.java +++ b/src/com/ample/icms/scan/ImageUpload.java @@ -2,11 +2,12 @@ package com.ample.icms.scan; import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.BizObjectManager; -import com.amarsoft.are.jbo.JBOException; import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.are.util.StringFunction; import com.amarsoft.awe.util.SqlObject; import com.amarsoft.awe.util.Transaction; import com.ample.icms.service.ImageService; +import com.ample.icms.util.GetInfoUtil; import com.ample.icms.util.PropertiesUtil; import com.sunyard.insurance.ecm.socket.client.AutoScanApi; import com.tenwa.officetempalte.exportcallback.impl.ZipUtils; @@ -23,29 +24,33 @@ import java.util.ArrayList; import java.util.List; public class ImageUpload extends ImageService { - private String zipPath ; private String projectId; private String flowUnid; - private String fileSavePath; - public void doUpload(){ + private String flowNo; + private static final String FileSavePath = PropertiesUtil.get("fileSavePathTemp"); + public String doUpload(){ // String zipPath = "C:/Users/ivanl/Desktop/影像系统/ECM4.0Demo/ECM4.0Demo/第三方上传/1111.zip"; - String zipPath = PropertiesUtil.get("fileSavePathTemp")+"/"+flowUnid+".zip"; + String zipPath = FileSavePath+"/"+flowUnid+".zip"; + String result = "0"; try { AutoScanApi autoScanApi = new AutoScanApi(PropertiesUtil.get("service_ip"),8088,PropertiesUtil.get("secret_id")+"#"+PropertiesUtil.get("secret_key")); - String result = autoScanApi.ScanImageFile(appCode, zipPath); - String returnCode = result.substring(0,result.indexOf("@")); - String returnMsg = result.substring(result.indexOf("@")+1,result.length()+1); - intoLog(returnCode,returnMsg); + result = autoScanApi.ScanImageFile(appCode, zipPath); } catch (Exception e) { e.printStackTrace(); } + return result; } public void intoLog(String code ,String msg) { Transaction transaction = null; Transaction.createTransaction("als"); SqlObject so = null; try { - so = new SqlObject("insert into icms_upload_log (id,flowunid,path,code,msg,inputtime) values ()"); + so = new SqlObject("insert into icms_upload_log (flowunid,path,code,msg,inputtime) values (:flowunid,:path,:code,:msg,:inputtime)"); + so.setParameter("flowunid",flowUnid); + so.setParameter("path",""); + so.setParameter("code",code); + so.setParameter("msg",msg); + so.setParameter("inputtime", StringFunction.getTodayNow()); transaction.executeSQL(so); transaction.commit(); } catch (Exception e) { @@ -54,29 +59,37 @@ public class ImageUpload extends ImageService { } - public void upload() throws JBOException, FileNotFoundException { + public String upload() throws Exception { /** * 1.找出需要上传的影像 * 3.在指定路径添加对应xml文件 * 4.打包上传 * 5.删除复制文件和打包文件 */ - FileOutputStream fos = new FileOutputStream(new File(PropertiesUtil.get("fileSavePathTemp")+"/"+flowUnid+".zip")); + FileOutputStream fos = new FileOutputStream(new File(FileSavePath+"/"+flowUnid+".zip")); ZipUtils zdo = new ZipUtils(); zdo.toZip(copyFile(),fos); + String result = doUpload(); + String returnCode = result.substring(0,result.indexOf("@")); + String returnMsg = result.substring(result.indexOf("@")+1,result.length()+1); + if(returnCode == "1"){ + deleteTemp(); + }; + intoLog(returnCode,returnMsg); + return returnMsg; } /** * 上传成功后再删除 */ public void deleteTemp(){ - File f = new File(PropertiesUtil.get("fileSavePathTemp")); + File f = new File(FileSavePath); if(f.length()!=0){ ZipUtils zdo = new ZipUtils(); zdo.deleteFile(f,false); } } - public List copyFile() throws JBOException { + public List copyFile() throws Exception { List files = new ArrayList<>(); BizObjectManager bom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME); List bos = bom.createQuery("sign_type='COMPLETE' and file_flag='yes' and project_id=:projectId and flow_unid=:flowUnid") @@ -88,16 +101,12 @@ public class ImageUpload extends ImageService { } //todo 加上xml文件 createXMl(); - File fileXML = new File("xmlpath"); + File fileXML = new File(FileSavePath+"/"+flowUnid+".xml"); files.add(fileXML); return files; } - public void createXMl() { - String appCode = "BQCW-000010"; - String appName = "签约文件"; - this.setAppCode(appCode); - this.setAppName(appName); - this.setBusiNo(flowUnid); + public void createXMl() throws Exception { + getAppInfo(); String xml = getRequestXML(); SAXReader saxReader = new SAXReader(); Document document; @@ -105,7 +114,7 @@ public class ImageUpload extends ImageService { document = saxReader.read(new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8))); OutputFormat format = OutputFormat.createPrettyPrint(); format.setEncoding("UTF-8"); - XMLWriter writer = new XMLWriter(new FileWriter(new File(PropertiesUtil.get("fileSavePathTemp")+"/"+flowUnid+".xml")),format); + XMLWriter writer = new XMLWriter(new FileWriter(new File(FileSavePath+"/"+flowUnid+".xml")),format); writer.write(document); writer.close(); } catch (DocumentException e) { @@ -113,7 +122,40 @@ public class ImageUpload extends ImageService { } catch (IOException e) { e.printStackTrace(); } + } + public void getAppInfo() throws Exception { + GetInfoUtil gif = new GetInfoUtil(); + gif.setFlowUnid(flowUnid); + gif.setFlowNo(flowNo); + String appInfo = gif.getAppCodeByContract(); + String[] app = appInfo.split("@"); + this.setAppCode(app[0]); + this.setAppName(app[1]); + this.setBusiNo(flowUnid); + } + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getFlowUnid() { + return flowUnid; + } + + public void setFlowUnid(String flowUnid) { + this.flowUnid = flowUnid; + } + + public String getFlowNo() { + return flowNo; + } + + public void setFlowNo(String flowNo) { + this.flowNo = flowNo; } } diff --git a/src/com/ample/icms/service/ImageService.java b/src/com/ample/icms/service/ImageService.java index 8d2d4c6ec..7dfe6b72b 100644 --- a/src/com/ample/icms/service/ImageService.java +++ b/src/com/ample/icms/service/ImageService.java @@ -7,16 +7,15 @@ import com.ample.icms.bean.ImageRoot; import com.ample.icms.util.PropertiesUtil; import com.sunyard.insurance.encode.client.EncodeAccessParam; import com.thoughtworks.xstream.XStream; -import org.apache.log4j.Logger; - -import java.io.IOException; -import java.util.ArrayList; - import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpException; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.SimpleHttpConnectionManager; import org.apache.commons.httpclient.methods.PostMethod; +import org.apache.log4j.Logger; + +import java.io.IOException; +import java.util.ArrayList; public class ImageService { public Logger logger = Logger.getLogger(this.getClass()); @@ -77,13 +76,13 @@ public class ImageService { PostMethod postMethod = null; HttpClient httpClient = null; try { - postMethod = new PostMethod(PropertiesUtil.get("secret_key")); + postMethod = new PostMethod(PropertiesUtil.get("url")); // 设置格式 postMethod.getParams().setContentCharset("UTF-8"); postMethod.setParameter("data", getRequestParam()); // ICMS影像系统通过referer来验证白名单，所以必须将ip填写在这里 //todo - postMethod.setRequestHeader("Referer", "http://172.16.20.212/imaging"); + postMethod.setRequestHeader("Referer", "http://47.93.34.101/imaging"); httpClient = new HttpClient(); // 执行postMethod int statusCode = httpClient.executeMethod(postMethod); diff --git a/src/com/ample/icms/util/GetInfoUtil.java b/src/com/ample/icms/util/GetInfoUtil.java new file mode 100644 index 000000000..b517ff6c3 --- /dev/null +++ b/src/com/ample/icms/util/GetInfoUtil.java @@ -0,0 +1,81 @@ +package com.ample.icms.util; + +import com.amarsoft.awe.util.SqlObject; +import com.amarsoft.awe.util.Transaction; + +public class GetInfoUtil { + private String flowUnid; + private String projectNo; + private String flowNo; + private String table; + public String getAppCodeByProject() throws Exception { + Transaction Sqlca = Transaction.createTransaction("als"); + SqlObject sql_icms = new SqlObject("select app_code,app_name from icms_rela where flow_no='"+flowNo+"' and project_no=(select PROJECT_NO from lb_project_info_temp where FLOWUNID='"+flowUnid+"')"); + //getStringMatrix()方法参数iMaxRow要比正常值+1，原系统bug + String[][] sReturn = Sqlca.getStringMatrix(sql_icms,2,2); + String appCode = null; + String appName = null; + if(sReturn.length>0){ + appCode = sReturn[0][0]; + appName = sReturn[0][1]; + } + if(Sqlca !=null){ + Sqlca.commit(); + } + if(appCode==null){ + return "未找到匹配的影像信息，请联系管理员"; + } + return appCode+"@"+appName; + } + + public String getAppCodeByContract() throws Exception { + Transaction Sqlca = Transaction.createTransaction("als"); + SqlObject sql_icms = new SqlObject("select app_code,app_name from icms_rela where flow_no='"+flowNo+"' and project_no=(select PROJECT_NO from lb_project_info where id=(select project_id from lb_contract_info_temp where FLOWUNID='"+flowUnid+"'))"); + String[][] sReturn = Sqlca.getStringMatrix(sql_icms,2,2); + String appCode = null; + String appName = null; + if(sReturn.length>0){ + appCode = sReturn[0][0]; + appName = sReturn[0][1]; + } + if(Sqlca !=null){ + Sqlca.commit(); + } + if(appCode==null){ + return "未找到匹配的影像信息，请联系管理员"; + } + return appCode+"@"+appName; + } + + public String getFlowUnid() { + return flowUnid; + } + + public void setFlowUnid(String flowUnid) { + this.flowUnid = flowUnid; + } + + public String getProjectNo() { + return projectNo; + } + + public void setProjectNo(String projectNo) { + this.projectNo = projectNo; + } + + public String getFlowNo() { + return flowNo; + } + + public void setFlowNo(String flowNo) { + this.flowNo = flowNo; + } + + public String getTable() { + return table; + } + + public void setTable(String table) { + this.table = table; + } +} diff --git a/src_tenwa/com/tenwa/lease/flow/project/commcheck/IcmsDocListCheck.java b/src_tenwa/com/tenwa/lease/flow/project/commcheck/IcmsDocListCheck.java new file mode 100644 index 000000000..de847edae --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/commcheck/IcmsDocListCheck.java @@ -0,0 +1,28 @@ +package com.tenwa.lease.flow.project.commcheck; + +import com.amarsoft.app.alarm.AlarmBiz; +import com.amarsoft.awe.util.Transaction; +import com.ample.icms.check.ImageCheck; + +/** + * 资料清单检查 + * @author 20170524 + * + */ +public class IcmsDocListCheck extends AlarmBiz { + @Override + public Object run(Transaction Sqlca) throws Exception { + ImageCheck ic= new ImageCheck(); + ic.setAppCode(""); + ic.setAppName(""); + ic.setBusiNo(this.getAttribute("ObjectNo").toString()); + String result = ic.getResult(); + if(ic.getResult()=="200"){ + setPass(true); + }else{ + putMsg("资料清单未完全上传"); + setPass(false); + } + return null; + } +} From f60799ee61796fa2eabe322abdf866ce88338c81 Mon Sep 17 00:00:00 2001 From: ap007 Date: Tue, 24 May 2022 17:35:45 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=88=9D=E6=AD=A5=E6=B5=8B=E8=AF=95=E4=BF=AE=E5=A4=8D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LBContractPersonBaseInfo.jsp | 17 +- .../MortgageFile/LbContactInfo.jsp | 10 +- .../BusinessChangeApplyList.jsp | 4 +- .../BusinessProjectTempInfo.jsp | 15 +- .../CautionMoneyDeduction/ContractInfoPay.jsp | 10 +- src/com/ample/icms/check/ImageCheck.java | 26 ++- src/com/ample/icms/init/IcmsRelationInit.java | 4 +- src/com/ample/icms/scan/ImageUpload.java | 4 +- src/com/ample/icms/service/ImageService.java | 2 +- src/com/ample/icms/util/GetInfoUtil.java | 204 +++++++++++++++--- .../project/commcheck/IcmsDocListCheck.java | 29 ++- 11 files changed, 249 insertions(+), 76 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp index 811ba6ecd..e7e556398 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp @@ -9,6 +9,7 @@ String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号 String sPhaseNo=CurPage.getParameter("PhaseNo");//阶段号 String FlowNo=CurPage.getParameter("FlowNo");//流程名称 + String projectNo=CurPage.getParameter("ProjectNo");//项目编号 String sPrevUrl = CurPage.getParameter("PrevUrl"); String ishistory=CurPage.getParameter("IsHistory"); String compClientID = request.getParameter("CompClientID"); @@ -106,19 +107,26 @@ } } function getRequestParam(){ - let appInfo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getAppCodeByContract", "flowUnid=<%=sFlowUnid%>,flowNo=<%=FlowNo%>"); + let appInfo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getAppInfoByFlowUnidRJM", "flowUnid=<%=sFlowUnid%>"); let index = appInfo.indexOf("@"); if(index==-1){ alert(appInfo); return; } - let appCode = appInfo.substr(0,index-1); + let appCode = appInfo.substr(0,index); let appName = appInfo.substr(index+1,appInfo.length); + if(appCode=='0000'){ + alert(appName); + return; + } let code = 'ECM0002'; - if("<%=sPhaseNo%>"=="0010"){ + if(("<%=sPhaseNo%>"=="0010")){ code = 'ECM0001'; } - let busiNo = '<%=sFlowUnid%>'; + let busiNo= "<%=projectNo%>"; + if(busiNo==null||busiNo==""||busiNo=="null"){ + busiNo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getProjectNoByFlowUnidRJM", "flowUnid=<%=sFlowUnid%>"); + } let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo); return param; } @@ -133,7 +141,6 @@ temp_form.target = "_blank"; temp_form.method = "post"; temp_form.style.display = "none"; - let opt = document.createElement("textarea"); opt.name = 'data'; opt.value = param; diff --git a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbContactInfo.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbContactInfo.jsp index 12f63e730..b9179fd19 100644 --- a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbContactInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbContactInfo.jsp @@ -9,6 +9,7 @@ String sFlowUnid = CurPage.getParameter("FlowUnid"); String sPhaseNo=CurPage.getParameter("PhaseNo");//阶段号 String FlowNo=CurPage.getParameter("FlowNo");//流程名称 + String projectNo=CurPage.getParameter("ProjectNo");//项目编号 if(sPrevUrl == null) sPrevUrl = ""; String sTempletNo = "LbContactInfo";//--模板号-- @@ -50,19 +51,22 @@ } } function getRequestParam(){ - let appInfo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getAppCodeByContract", "flowUnid=<%=sFlowUnid%>,flowNo=<%=FlowNo%>"); + let appInfo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getAppInfoByFlowUnidRJM", "flowUnid=<%=sFlowUnid%>"); let index = appInfo.indexOf("@"); if(index==-1){ alert(appInfo); return; } - let appCode = appInfo.substr(0,index-1); + let appCode = appInfo.substr(0,index); let appName = appInfo.substr(index+1,appInfo.length); let code = 'ECM0002'; if("<%=sPhaseNo%>"=="0010"){ code = 'ECM0001'; } - let busiNo = '<%=sFlowUnid%>'; + let busiNo = '<%=projectNo%>'; + if(busiNo==null||busiNo==""||busiNo=="null"){ + busiNo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getProjectNoByFlowUnidRJM", "flowUnid=<%=sFlowUnid%>"); + } let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo); return param; } diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp index 037230ef7..90c344feb 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp @@ -15,7 +15,7 @@ sReturn = sReturn.split("@"); var id=sReturn[0] var product_id=sReturn[1]; - var project_id = sReturn[2]; + var projectNo = sReturn[2]; var project_name = sReturn[3]; var CustomerType = sReturn[4]; var carAttributes = sReturn[5]; @@ -35,7 +35,7 @@ return ; } var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; - sParams =sParams+",channel="+channel+",SubjectId="+SubjectId+",SubjectName="+SubjectName+",certtype="+certtype+",customertype="+CustomerType+",carAttributes="+carAttributes+",leasform="+leasehold+",operationType="+operationType+",ProjectId="+id+",ProductId="+product_id+",FlowKey="+project_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; + sParams =sParams+",channel="+channel+",SubjectId="+SubjectId+",SubjectName="+SubjectName+",certtype="+certtype+",customertype="+CustomerType+",carAttributes="+carAttributes+",leasform="+leasehold+",operationType="+operationType+",ProjectNo="+projectNo+",ProjectId="+id+",ProductId="+product_id+",FlowKey="+projectNo+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams); if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return; var sReturnInfos=sReturnInfo.split("@"); diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp index 07d011c7f..a090b6d5c 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp @@ -10,6 +10,7 @@ String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号 String sPhaseNo=CurPage.getParameter("PhaseNo");//阶段号 String FlowNo=CurPage.getParameter("FlowNo");//流程名称 + String projectNo=CurPage.getParameter("ProjectNo");//项目编号 String sPrevUrl = CurPage.getParameter("PrevUrl"); String operationType = CurPage.getParameter("operationType");//获取产品类型 if(sPrevUrl == null) sPrevUrl = ""; @@ -181,8 +182,7 @@ } } function getRequestParam(){ - debugger; - let appInfo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getAppCodeByProject", "flowUnid=<%=sFlowUnid%>,flowNo=<%=FlowNo%>"); + let appInfo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getAppInfoByFlowUnidRJM", "flowUnid=<%=sFlowUnid%>"); let index = appInfo.indexOf("@"); if(index==-1){ alert(appInfo); @@ -191,10 +191,13 @@ let appCode = appInfo.substr(0,index); let appName = appInfo.substr(index+1,appInfo.length); let code = 'ECM0002'; - if(("<%=sPhaseNo%>"=="0010") && ("<%=FlowNo%>"=="BusinessApplyFlow" || "<%=FlowNo%>" == "BusinessChangeFlow")){ + if(("<%=sPhaseNo%>"=="0010")){ code = 'ECM0001'; } - let busiNo = '<%=sFlowUnid%>'; + let busiNo="<%=projectNo%>" + if(busiNo==null||busiNo==""||busiNo=="null"){ + busiNo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getProjectNoByFlowUnidRJM", "flowUnid=<%=sFlowUnid%>"); + } let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo); return param; } @@ -209,7 +212,6 @@ temp_form.target = "_blank"; temp_form.method = "post"; temp_form.style.display = "none"; - let opt = document.createElement("textarea"); opt.name = 'data'; opt.value = param; @@ -218,9 +220,6 @@ document.body.appendChild(temp_form); temp_form.submit(); } - function product(){ - RunJavaMethod("com.tenwa.util.test","product",""); - } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp index 52f7e7516..5e19eb7e3 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp @@ -13,6 +13,7 @@ String contractId = CurPage.getParameter("ContractId"); String compClientID = CurPage.getParameter("CompClientID"); String phaseNo = CurPage.getParameter("PhaseNo"); + String projectNo=CurPage.getParameter("ProjectNo");//项目编号 String ProductId = CurPage.getParameter("ProductId"); //String corpusSource = Sqlca.getString("select corpus_source from LB_CONTRACT_INFO_TEMP where flowunid = '"+flowunid+"'"); String projectId = CurPage.getParameter("ProjectId"); @@ -178,19 +179,22 @@ window.onload = function(){ } } function getRequestParam(){ - let appInfo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getAppCodeByContract", "flowUnid=<%=flowunid%>,flowNo=<%=FlowNo%>"); + let appInfo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getAppInfoByFlowUnidRJM", "flowUnid=<%=flowunid%>"); let index = appInfo.indexOf("@"); if(index==-1){ alert(appInfo); return; } - let appCode = appInfo.substr(0,index-1); + let appCode = appInfo.substr(0,index); let appName = appInfo.substr(index+1,appInfo.length); let code = 'ECM0002'; if("<%=phaseNo%>"=="0010"){ code = 'ECM0001'; } - let busiNo = '<%=flowunid%>'; + let busiNo = '<%=projectNo%>'; + if(busiNo==null||busiNo==""||busiNo=="null"){ + busiNo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getProjectNoByFlowUnidRJM", "flowUnid=<%=flowunid%>"); + } let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo); return param; } diff --git a/src/com/ample/icms/check/ImageCheck.java b/src/com/ample/icms/check/ImageCheck.java index d8588cd4f..afa7a6405 100644 --- a/src/com/ample/icms/check/ImageCheck.java +++ b/src/com/ample/icms/check/ImageCheck.java @@ -1,18 +1,26 @@ package com.ample.icms.check; import com.ample.icms.service.ImageService; +import org.dom4j.Document; +import org.dom4j.DocumentException; +import org.dom4j.DocumentHelper; +import org.dom4j.Element; public class ImageCheck extends ImageService { - public String getResult(){ + public String getResult() throws DocumentException { this.setCode("ECM0013"); - String result = doPost(); - if(result.contains("200")){ - //true - }else if(result.contains("-1")){ - //error - }else{ - //false + String result = this.doPost(); + String responseCode = ""; + String responseMsg = ""; + if("0000".equals(result)){ + responseCode = "0000"; + responseMsg = "连接影像系统失败，请及时联系管理员！"; + }else { + Document dom = DocumentHelper.parseText(result); + Element root = dom.getRootElement(); + responseCode = root.element("RESPONSE_CODE").getTextTrim(); + responseMsg = root.element("RESPONSE_MSG").getTextTrim(); } - return result; + return responseCode+"@"+responseMsg; } } diff --git a/src/com/ample/icms/init/IcmsRelationInit.java b/src/com/ample/icms/init/IcmsRelationInit.java index 1cde1f3f3..db3f8e840 100644 --- a/src/com/ample/icms/init/IcmsRelationInit.java +++ b/src/com/ample/icms/init/IcmsRelationInit.java @@ -16,10 +16,10 @@ public class IcmsRelationInit extends BaseBussiness { BizObject boLPIT = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME,tx).createQuery("flowunid=:flowunid").setParameter("flowunid",this.getAttribute("ObjectNo").toString()).getSingleResult(false); String projectNo = boLPIT.getAttribute("project_no").toString(); String productId = boLPIT.getAttribute("product_id").toString(); - SqlObject sql_icms = new SqlObject("select flown,app_code,app_name from icms_prd_rela where productid='"+productId+"' group by flown,app_code"); + SqlObject sql_icms = new SqlObject("select flowno,app_code,app_name from icms_prd_rela where productid='"+productId+"' group by flowno,app_code"); ASResultSet rs = Sqlca.getASResultSet(sql_icms); while (rs.next()){ - String flowNo = rs.getString("flown"); + String flowNo = rs.getString("flowno"); String appCode = rs.getString("app_code"); String appName = rs.getString("app_name"); SqlObject sql_rela = new SqlObject("insert into icms_rela (id,project_no,flow_no,app_code,app_name) values(REPLACE(UUID(), '-', ''),'"+projectNo+"','"+flowNo+"','"+appCode+"','"+appName+"')"); diff --git a/src/com/ample/icms/scan/ImageUpload.java b/src/com/ample/icms/scan/ImageUpload.java index 0c42d7858..8b657ca9c 100644 --- a/src/com/ample/icms/scan/ImageUpload.java +++ b/src/com/ample/icms/scan/ImageUpload.java @@ -125,9 +125,7 @@ public class ImageUpload extends ImageService { } public void getAppInfo() throws Exception { GetInfoUtil gif = new GetInfoUtil(); - gif.setFlowUnid(flowUnid); - gif.setFlowNo(flowNo); - String appInfo = gif.getAppCodeByContract(); + String appInfo = gif.getAppInfoByFlowUnid(flowUnid); String[] app = appInfo.split("@"); this.setAppCode(app[0]); this.setAppName(app[1]); diff --git a/src/com/ample/icms/service/ImageService.java b/src/com/ample/icms/service/ImageService.java index 7dfe6b72b..c85c95e12 100644 --- a/src/com/ample/icms/service/ImageService.java +++ b/src/com/ample/icms/service/ImageService.java @@ -82,7 +82,7 @@ public class ImageService { postMethod.setParameter("data", getRequestParam()); // ICMS影像系统通过referer来验证白名单，所以必须将ip填写在这里 //todo - postMethod.setRequestHeader("Referer", "http://47.93.34.101/imaging"); + postMethod.setRequestHeader("Referer", "http://47.93.34.101"); httpClient = new HttpClient(); // 执行postMethod int statusCode = httpClient.executeMethod(postMethod); diff --git a/src/com/ample/icms/util/GetInfoUtil.java b/src/com/ample/icms/util/GetInfoUtil.java index b517ff6c3..1ab119ff9 100644 --- a/src/com/ample/icms/util/GetInfoUtil.java +++ b/src/com/ample/icms/util/GetInfoUtil.java @@ -1,50 +1,175 @@ package com.ample.icms.util; +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.awe.util.ASResultSet; import com.amarsoft.awe.util.SqlObject; import com.amarsoft.awe.util.Transaction; +import java.sql.SQLException; + public class GetInfoUtil { private String flowUnid; private String projectNo; + private String productId; private String flowNo; - private String table; - public String getAppCodeByProject() throws Exception { - Transaction Sqlca = Transaction.createTransaction("als"); - SqlObject sql_icms = new SqlObject("select app_code,app_name from icms_rela where flow_no='"+flowNo+"' and project_no=(select PROJECT_NO from lb_project_info_temp where FLOWUNID='"+flowUnid+"')"); - //getStringMatrix()方法参数iMaxRow要比正常值+1，原系统bug - String[][] sReturn = Sqlca.getStringMatrix(sql_icms,2,2); - String appCode = null; - String appName = null; - if(sReturn.length>0){ - appCode = sReturn[0][0]; - appName = sReturn[0][1]; - } - if(Sqlca !=null){ - Sqlca.commit(); - } - if(appCode==null){ - return "未找到匹配的影像信息，请联系管理员"; - } - return appCode+"@"+appName; + private String sTable; + + /** + * 根据流程ID获取appCode和appName + * + * @return + * @throws Exception + */ + public String getAppInfoByFlowUnidRJM() throws Exception { + return getAppInfoByFlowUnid(this.flowUnid); } - public String getAppCodeByContract() throws Exception { + public String getAppInfoByFlowUnid(String flowUnid) throws Exception { Transaction Sqlca = Transaction.createTransaction("als"); - SqlObject sql_icms = new SqlObject("select app_code,app_name from icms_rela where flow_no='"+flowNo+"' and project_no=(select PROJECT_NO from lb_project_info where id=(select project_id from lb_contract_info_temp where FLOWUNID='"+flowUnid+"'))"); - String[][] sReturn = Sqlca.getStringMatrix(sql_icms,2,2); - String appCode = null; - String appName = null; - if(sReturn.length>0){ - appCode = sReturn[0][0]; - appName = sReturn[0][1]; + String projectNo = this.getProjectNoByFlowUnid(flowUnid, Sqlca); + if (projectNo == null || "".equals(projectNo)) { + return "0000@未找到当前流程对应的项目编号"; } - if(Sqlca !=null){ + String flowNo = this.getFlowNoByFlowUnid(flowUnid, Sqlca); + if (flowNo == null || "".equals(flowNo)) { + return "0000@未找到当前流程对应的流程编号"; + } + String appInfo = getAppInfoByProjectNo(projectNo, flowNo, Sqlca); + if(appInfo==null){ + String productId = getProductIdByFlowUnid(flowUnid, Sqlca); + appInfo = this.getAppInfoByProductId(productId, flowNo, Sqlca); + } + if (Sqlca != null) { Sqlca.commit(); } - if(appCode==null){ - return "未找到匹配的影像信息，请联系管理员"; + return appInfo; + } + + /** + * 根据项目编号和流程编号获取appCode和appName + * + * @return + * @throws SQLException + */ + public String getAppInfoByProjectNoRJM() throws SQLException, JBOException { + return getAppInfoByProjectNo(this.projectNo, this.flowNo); + } + + public String getAppInfoByProjectNo(String projectNo, String flowNo) throws SQLException, JBOException { + Transaction Sqlca = Transaction.createTransaction("als"); + String appInfo = this.getAppInfoByProjectNo(projectNo, flowNo, Sqlca); + return appInfo; + } + + public String getAppInfoByProjectNo(String projectNo, String flowNo, Transaction Sqlca) throws SQLException, JBOException { + String sql = "select app_code,app_name from icms_rela where flow_no='" + flowNo + "' and project_no='" + projectNo + "'"; + SqlObject sql_icms = new SqlObject(sql); + ASResultSet rs = Sqlca.getASResultSet(sql_icms); + String appCode = null; + String appName = null; + while (rs.next()) { + appCode = rs.getString("app_code"); + appName = rs.getString("app_name"); } - return appCode+"@"+appName; + String appInfo = appCode + "@" + appName; + if (appCode == null) { + return null; + } + + return appInfo; + } + + /** + * 根据productId和流程编号获取appCode和appName + * + * @return + * @throws SQLException + */ + public String getAppInfoByProductIdRJM() throws SQLException, JBOException { + return getAppInfoByProjectNo(this.productId, this.flowNo); + } + + public String getAppInfoByProductId(String productId, String flowNo) throws SQLException, JBOException { + Transaction Sqlca = Transaction.createTransaction("als"); + String appInfo = this.getAppInfoByProductId(productId, flowNo, Sqlca); + return appInfo; + } + + public String getAppInfoByProductId(String productId, String flowNo, Transaction Sqlca) throws SQLException, JBOException { + String sql = "select app_code,app_name from icms_prd_rela where flowno='" + flowNo + "' and productid='" + productId + "'"; + SqlObject sql_icms = new SqlObject(sql); + ASResultSet rs = Sqlca.getASResultSet(sql_icms); + String appCode = null; + String appName = null; + while (rs.next()) { + appCode = rs.getString("app_code"); + appName = rs.getString("app_name"); + } + if (appCode == null) { + return "0000@未找到初始化的影像信息配置，请联系管理员"; + } + String appInfo = appCode + "@" + appName; + return appInfo; + } + + /** + * 根据flowunid获取projectNo + * + * @return + * @throws SQLException + */ + public String getProjectNoByFlowUnidRJM() throws SQLException, JBOException { + return getProjectNoByFlowUnid(this.flowUnid); + } + + public String getProjectNoByFlowUnid(String flowUnid) throws SQLException, JBOException { + Transaction Sqlca = Transaction.createTransaction("als"); + String projectNo = getProjectNoByFlowUnid(flowUnid, Sqlca); + if (Sqlca != null) { + Sqlca.commit(); + } + return projectNo; + } + + public String getProjectNoByFlowUnid(String flowUnid, Transaction Sqlca) throws SQLException { + String sql = "select PROJECT_NO from lb_project_info_temp where FLOWUNID='" + flowUnid + "'"; + String projectNo = Sqlca.getString(new SqlObject(sql)); + if (projectNo == null || "".equals(projectNo) || projectNo.length() == 0) { + sql = "select PROJECT_NO from lb_project_info where id=(select project_id from lb_contract_info_temp where FLOWUNID='" + flowUnid + "')"; + projectNo = Sqlca.getString(new SqlObject(sql)); + } + if (projectNo == null || "".equals(projectNo) || projectNo.length() == 0) { + return null; + } + return projectNo; + } + + /** + * 根据流程编号 + * + * @param flowUnid + * @param Sqlca + * @return + * @throws SQLException + */ + public String getFlowNoByFlowUnid(String flowUnid, Transaction Sqlca) throws SQLException { + String sql = "select flowno from flow_object where objectno='" + flowUnid + "'"; + String flowNo = Sqlca.getString(new SqlObject(sql)); + return flowNo; + } + + /** + * 根据flowunid获取productid + * + * @param flowUnid + * @param Sqlca + * @return + * @throws SQLException + */ + public String getProductIdByFlowUnid(String flowUnid, Transaction Sqlca) throws SQLException { + String sql = "select productId from flow_bussiness_object where flow_unid='" + flowUnid + "'"; + String productId = Sqlca.getString(new SqlObject(sql)); + return productId; } public String getFlowUnid() { @@ -71,11 +196,20 @@ public class GetInfoUtil { this.flowNo = flowNo; } - public String getTable() { - return table; + public String getsTable() { + return sTable; } - public void setTable(String table) { - this.table = table; + public void setsTable(String sTable) { + this.sTable = sTable; } + + public String getProductId() { + return productId; + } + + public void setProductId(String productId) { + this.productId = productId; + } + } diff --git a/src_tenwa/com/tenwa/lease/flow/project/commcheck/IcmsDocListCheck.java b/src_tenwa/com/tenwa/lease/flow/project/commcheck/IcmsDocListCheck.java index de847edae..b43ef1e48 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commcheck/IcmsDocListCheck.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commcheck/IcmsDocListCheck.java @@ -3,6 +3,7 @@ package com.tenwa.lease.flow.project.commcheck; import com.amarsoft.app.alarm.AlarmBiz; import com.amarsoft.awe.util.Transaction; import com.ample.icms.check.ImageCheck; +import com.ample.icms.util.GetInfoUtil; /** * 资料清单检查 @@ -12,17 +13,35 @@ import com.ample.icms.check.ImageCheck; public class IcmsDocListCheck extends AlarmBiz { @Override public Object run(Transaction Sqlca) throws Exception { + String flowUnid = this.getAttribute("ObjectNo").toString(); + GetInfoUtil gif = new GetInfoUtil(); + String projectNo = gif.getProjectNoByFlowUnid(flowUnid); + if(projectNo==null){ + setPass(false); + putMsg("未找到匹配的项目编号，请联系管理员！"); + return null; + } + String app = gif.getAppInfoByFlowUnid(flowUnid); + String [] appInfo = app.split("@"); + String appCode = appInfo[0]; + String appName = appInfo[1]; + if("0000".equals(appCode)){ + setPass(false); + putMsg(appName); + return null; + } ImageCheck ic= new ImageCheck(); - ic.setAppCode(""); - ic.setAppName(""); - ic.setBusiNo(this.getAttribute("ObjectNo").toString()); + ic.setAppCode(appCode); + ic.setAppName(appName); + ic.setBusiNo(projectNo); String result = ic.getResult(); - if(ic.getResult()=="200"){ + String[] resultInfo = result.split("@"); + if("200".equals(resultInfo[0])){ setPass(true); }else{ - putMsg("资料清单未完全上传"); setPass(false); } + putMsg(resultInfo[1]); return null; } } From bd2762000c606ba8f0cf87be8daeb730db140553 Mon Sep 17 00:00:00 2001 From: ap007 Date: Wed, 22 Jun 2022 16:34:44 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E9=82=AE=E5=AF=84=E8=B5=84=E6=96=99?= =?UTF-8?q?=E5=BD=92=E6=A1=A3=E7=AD=89=E5=86=85=E5=AE=B9=E7=9A=84=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LBnotAllMailHndHandoverTempList.jsp | 54 ++- .../Flow/Comm/LBProject/LBProjectInfo.jsp | 107 +++-- .../FileMailArching/FileMailArchivingList.jsp | 30 ++ WebContent/WEB-INF/etc/jbo/jbo_doc.xml | 413 ++++++++++-------- config/icms.properties | 4 +- src/com/ample/icms/bean/ImageMetaData.java | 12 - .../icms/bean/{ => image}/ImageAttr.java | 2 +- .../icms/bean/{ => image}/ImageBaseData.java | 2 +- .../icms/bean/{ => image}/ImageBatch.java | 14 +- .../icms/bean/{ => image}/ImageBizInfo.java | 2 +- .../icms/bean/{ => image}/ImageBizType.java | 2 +- .../ample/icms/bean/image/ImageMetaData.java | 22 + src/com/ample/icms/bean/image/ImageNode.java | 49 +++ src/com/ample/icms/bean/image/ImagePage.java | 124 ++++++ src/com/ample/icms/bean/image/ImagePages.java | 19 + .../icms/bean/{ => image}/ImageRoot.java | 2 +- .../icms/bean/{ => image}/ImageTree.java | 2 +- src/com/ample/icms/query/ImageCount.java | 13 + src/com/ample/icms/query/ImageQuery.java | 47 ++ src/com/ample/icms/scan/ImageDownload.java | 7 +- src/com/ample/icms/scan/ImageScan.java | 2 +- src/com/ample/icms/scan/ImageUpload.java | 123 ++++-- src/com/ample/icms/service/ImageService.java | 58 ++- src/com/ample/icms/util/GetInfoUtil.java | 137 +++++- .../app/tenwa/doc/LB_MAILARCHIVING_INFO.java | 39 ++ .../tenwa/doc/LB_MAILARCHIVING_INFO_TEMP.java | 41 ++ .../project/businessapply/DocMailAction.java | 97 +++- .../commbusiness/LBFileMailTempToFormal.java | 30 +- 28 files changed, 1098 insertions(+), 356 deletions(-) create mode 100644 WebContent/Tenwa/Lease/Flow/FileManager/FileMailArching/FileMailArchivingList.jsp delete mode 100644 src/com/ample/icms/bean/ImageMetaData.java rename src/com/ample/icms/bean/{ => image}/ImageAttr.java (98%) rename src/com/ample/icms/bean/{ => image}/ImageBaseData.java (98%) rename src/com/ample/icms/bean/{ => image}/ImageBatch.java (85%) rename src/com/ample/icms/bean/{ => image}/ImageBizInfo.java (88%) rename src/com/ample/icms/bean/{ => image}/ImageBizType.java (93%) create mode 100644 src/com/ample/icms/bean/image/ImageMetaData.java create mode 100644 src/com/ample/icms/bean/image/ImageNode.java create mode 100644 src/com/ample/icms/bean/image/ImagePage.java create mode 100644 src/com/ample/icms/bean/image/ImagePages.java rename src/com/ample/icms/bean/{ => image}/ImageRoot.java (92%) rename src/com/ample/icms/bean/{ => image}/ImageTree.java (93%) create mode 100644 src/com/ample/icms/query/ImageCount.java create mode 100644 src_jbo/jbo/app/tenwa/doc/LB_MAILARCHIVING_INFO.java create mode 100644 src_jbo/jbo/app/tenwa/doc/LB_MAILARCHIVING_INFO_TEMP.java diff --git a/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverTempList.jsp b/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverTempList.jsp index 1e0cfd6e2..0c6b2c8cd 100644 --- a/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverTempList.jsp +++ b/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverTempList.jsp @@ -7,6 +7,7 @@ */ String flowunid = CurPage.getParameter("ObjectNo"); String PhaseNo = CurPage.getParameter("PhaseNo"); + String projectNo = CurPage.getParameter("projectNo"); ASObjectModel doTemp = new ASObjectModel("LBnotAllMailHndHandoverTempList"); if("0010".equals(PhaseNo)){ // doTemp.setVisible("ALLHANDOVERSTATUS", false);//显示归档状态 @@ -145,26 +146,8 @@ },"邮寄详情"); } function viewOpinionFilelist(i){ - var contract_id=getItemValue(0, i, "PROJECT_ID"); - var ProductId=getItemValue(0, i, "PRODUCT_ID"); - var id=getItemValue(0, i, "id"); - var sUrl="/Tenwa/Apzl/FileUpload/PayDocMailList.jsp"; - AsDialog.PopView(sUrl,"contract_id="+contract_id+"&productId="+ProductId+"&FlowUnid=<%=flowunid%>&PhaseNo=<%=CurPage.getParameter("PhaseNo")%>&id="+id+"&type=his","dialogWidth=1200px;dialogHeight=600px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(){reloadSelf(); - for(var i=0;i邮寄明细'; - } - if(getObj(0,i,"opinion")!=null&&getObj(0,i,"opinion")!="null"){ - getObj(0,i,"opinion").innerHTML='签署意见'; - } - if(getObj(0,i,"filelist")!=null&&getObj(0,i,"filelist")!="null"){ - getObj(0,i,"filelist").innerHTML='历史附件查看'; - } - if(getObj(0,i,"BusinessConditions")!=null&&getObj(0,i,"BusinessConditions")!="null"){ - getObj(0,i,"BusinessConditions").innerHTML='商务条件'; - } - } - },"邮寄详情"); + var projectId=getItemValue(0, i, "PROJECT_ID"); + openFileList(projectId); } function viewBusinessConditions(i){ var contract_id=getItemValue(0, i, "PROJECT_ID"); @@ -218,6 +201,37 @@ } } } + function openFileList(projectId){ + let url = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestUrl",""); + let params = getRequestParam(projectId); + if(params!=null){ + post(url,params); + } + } + function getRequestParam(projectId){ + let code = 'ECM0002'; + let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParamByProjectId","projectId="+projectId+",code="+code); + return param; + } + /** + * 考虑防止一些浏览器的弹窗被阻止，不用ajax，而是用form表单提交的方式 + * @param URL + * @param PARAMS + */ + function post(URL, param) { + let temp_form = document.createElement("form"); + temp_form.action = URL; + temp_form.target = "_blank"; + temp_form.method = "post"; + temp_form.style.display = "none"; + let opt = document.createElement("textarea"); + opt.name = 'data'; + opt.value = param; + temp_form.appendChild(opt); + + document.body.appendChild(temp_form); + temp_form.submit(); + } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBProject/LBProjectInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBProject/LBProjectInfo.jsp index 6ca9ca668..4f62c3616 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBProject/LBProjectInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBProject/LBProjectInfo.jsp @@ -9,7 +9,7 @@ Content: 项目基本信息详情页面 Input Param: Output param: - History Log: + History Log: */ %> <%/*~END~*/%> @@ -26,6 +26,8 @@ <% String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号 String FlowNo = CurPage.getParameter("FlowNo");//流程编号 + String sPhaseNo=CurPage.getParameter("PhaseNo");//阶段号 + String projectNo=CurPage.getParameter("ProjectNo");//项目编号 if(sFlowUnid == null) sFlowUnid=""; String sTempletNo = CurPage.getParameter("TempletNo");//模板号 if(sTempletNo == null) sTempletNo = "LBProjectInfoTemp"; @@ -42,13 +44,13 @@ levelOrgId=orgid.substring(0, 9+(i+1)*4); } orgdeptname+=CurUser.getOrgName(); - + }else{ orgdeptname=CurUser.getOrgName(); orgidname=CurUser.getOrgName(); } String userid = CurUser.getUserID();//用户id - String useridname = CurUser.getUserName();//用户姓名 + String useridname = CurUser.getUserName();//用户姓名 String today = StringFunction.getToday(); String RightType=CurPage.getParameter("RightType"); String ishistory=CurPage.getParameter("IsHistory"); @@ -56,13 +58,13 @@ String productId = CurPage.getParameter("ProductId"); %> <%/*~END~*/%> - - + + <%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info03;Describe=定义数据对象;]~*/%> - <% - + <% + ASObjectModel doTemp = new ASObjectModel(sTempletNo); - + if(null!=ishistory&&ishistory.equals("true") && !"ProjectApprovalFlow".equals(FlowNo)){ doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//如果是历史则新显示历史数据 } @@ -73,36 +75,39 @@ doTemp.setRequired("LEAS_FORM", false); doTemp.setVisible("LEAS_FORM", false); } - + %> <%@ include file="/Tenwa/Lease/Flow/Comm/baseShowFormal.jspf"%> -<% +<% ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform + String ShowButton = "false"; if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){ dwTemp.ReadOnly = "-2";//只读模式 RightType="ReadOnly"; - isShowButton=false; + // isShowButton=false; }else{ - isShowButton=true; + // isShowButton=true; + ShowButton = "true"; } - if(isShowForaml.equals("true")){ + if(isShowForaml.equals("true")){ dwTemp.genHTMLObjectWindow(sProjectId); }else{ dwTemp.genHTMLObjectWindow(sFlowUnid); } - + CurPage.getCurComp().setAttribute("RightType",RightType); %> <%/*~END~*/%> - - + + <%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info04;Describe=定义按钮;]~*/%> -<% +<% String sButtons[][] =null; sButtons= new String[][]{ - {"true","All","Button","保存","保存所有修改","saveRecord()","","","",""} + {ShowButton,"All","Button","保存","保存所有修改","saveRecord()","","","",""}, + {"true","","Button","资料清单","资料清单","openFileList()","","","","btn_icon_saveNew",""} }; %> <%/*~END~*/%> @@ -118,10 +123,10 @@ //---------------------定义按钮事件------------------------------------ /*~[Describe=保存记录;InputParam=无;OutPutParam=无;]~*/ function saveRecord(){ - - as_save("myiframe0"); + + as_save("myiframe0"); } - + <%/*~END~*/%> @@ -142,7 +147,7 @@ //选择项目协办 function selectAssist(){ AsDialog.OpenSelector("SelectManager","orgid,<%=orgid%>","dialogWidth=" + parseInt(window.screen.width * 0.5) + "px dialogHeight=" + parseInt(window.screen.height * 0.3) + "px",function(sReturn){ - + if(!sReturn || sReturn == "_CANCEL_"||sReturn=="_NONE_"||sReturn=="_CLEAR_"){ return; } @@ -150,11 +155,11 @@ setItemValue(0,getRow(),"PROJECT_ASSIST_NAME",sReturn[1]); setItemValue(0,getRow(),"PROJECT_ASSIST",sReturn[0]); },"请选项目协办"); - } + } <%/*~END~*/%> - - + + <%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=Info08;Describe=页面装载时，进行初始化;]~*/%> + + <%/*~END~*/%> <%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Tenwa/Lease/Flow/FileManager/FileMailArching/FileMailArchivingList.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/FileMailArching/FileMailArchivingList.jsp new file mode 100644 index 000000000..26ef1fd5a --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/FileManager/FileMailArching/FileMailArchivingList.jsp @@ -0,0 +1,30 @@ + +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + ASObjectModel doTemp = new ASObjectModel("LBFileArchivingList"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; + dwTemp.ReadOnly = "1"; + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(""); + + String sButtons[][] =new String[][] { + {"true","","Button","归档","归档","fileArchiving()","","","","btn_icon_edit"} + }; + +%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/jbo/jbo_doc.xml b/WebContent/WEB-INF/etc/jbo/jbo_doc.xml index cacb4318d..39ffc6e35 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_doc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_doc.xml @@ -165,36 +165,36 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + @@ -212,174 +212,219 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/icms.properties b/config/icms.properties index c2e4e76f0..f90bfa037 100644 --- a/config/icms.properties +++ b/config/icms.properties @@ -1,5 +1,5 @@ -url=http://192.168.7.71:8081/SunICMS/servlet/RouterServlet -service_ip=192.168.7.71 +url=http://192.168.7.72:8081/SunICMS/servlet/RouterServlet +service_ip=192.168.7.72 #\u94FE\u63A5\u6709\u6548\u65F6\u95F4\uFF0C\u5355\u4F4D\u4E3A\u79D2 useful_life=360 #\u4E1A\u52A1\u7CFB\u7EDF\u6388\u6743\u5BC6\u94A5 diff --git a/src/com/ample/icms/bean/ImageMetaData.java b/src/com/ample/icms/bean/ImageMetaData.java deleted file mode 100644 index 5a8fe4d91..000000000 --- a/src/com/ample/icms/bean/ImageMetaData.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.ample.icms.bean; - -import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamImplicit; - -import java.util.List; - -@XStreamAlias("META_DATA") -public class ImageMetaData { - @XStreamImplicit - public List imageBatchs ; -} diff --git a/src/com/ample/icms/bean/ImageAttr.java b/src/com/ample/icms/bean/image/ImageAttr.java similarity index 98% rename from src/com/ample/icms/bean/ImageAttr.java rename to src/com/ample/icms/bean/image/ImageAttr.java index 2b8c67a62..f37862156 100644 --- a/src/com/ample/icms/bean/ImageAttr.java +++ b/src/com/ample/icms/bean/image/ImageAttr.java @@ -1,4 +1,4 @@ -package com.ample.icms.bean; +package com.ample.icms.bean.image; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/src/com/ample/icms/bean/ImageBaseData.java b/src/com/ample/icms/bean/image/ImageBaseData.java similarity index 98% rename from src/com/ample/icms/bean/ImageBaseData.java rename to src/com/ample/icms/bean/image/ImageBaseData.java index bdce5f6d7..d749e534f 100644 --- a/src/com/ample/icms/bean/ImageBaseData.java +++ b/src/com/ample/icms/bean/image/ImageBaseData.java @@ -1,4 +1,4 @@ -package com.ample.icms.bean; +package com.ample.icms.bean.image; import com.thoughtworks.xstream.annotations.XStreamAlias; diff --git a/src/com/ample/icms/bean/ImageBatch.java b/src/com/ample/icms/bean/image/ImageBatch.java similarity index 85% rename from src/com/ample/icms/bean/ImageBatch.java rename to src/com/ample/icms/bean/image/ImageBatch.java index b94511dff..f1413cf06 100644 --- a/src/com/ample/icms/bean/ImageBatch.java +++ b/src/com/ample/icms/bean/image/ImageBatch.java @@ -1,4 +1,4 @@ -package com.ample.icms.bean; +package com.ample.icms.bean.image; import com.thoughtworks.xstream.annotations.XStreamAlias; @@ -30,6 +30,10 @@ public class ImageBatch { private String endTime; + @XStreamAlias("PAGES") + private ImagePages pages; + + public String getAppCode() { return appCode; } @@ -77,4 +81,12 @@ public class ImageBatch { public void setEndTime(String endTime) { this.endTime = endTime; } + + public ImagePages getPages() { + return pages; + } + + public void setPages(ImagePages pages) { + this.pages = pages; + } } diff --git a/src/com/ample/icms/bean/ImageBizInfo.java b/src/com/ample/icms/bean/image/ImageBizInfo.java similarity index 88% rename from src/com/ample/icms/bean/ImageBizInfo.java rename to src/com/ample/icms/bean/image/ImageBizInfo.java index bb0ae82d6..b56929e51 100644 --- a/src/com/ample/icms/bean/ImageBizInfo.java +++ b/src/com/ample/icms/bean/image/ImageBizInfo.java @@ -1,4 +1,4 @@ -package com.ample.icms.bean; +package com.ample.icms.bean.image; import com.thoughtworks.xstream.annotations.XStreamAlias; diff --git a/src/com/ample/icms/bean/ImageBizType.java b/src/com/ample/icms/bean/image/ImageBizType.java similarity index 93% rename from src/com/ample/icms/bean/ImageBizType.java rename to src/com/ample/icms/bean/image/ImageBizType.java index 6ec860f68..f7c6f48e1 100644 --- a/src/com/ample/icms/bean/ImageBizType.java +++ b/src/com/ample/icms/bean/image/ImageBizType.java @@ -1,4 +1,4 @@ -package com.ample.icms.bean; +package com.ample.icms.bean.image; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/src/com/ample/icms/bean/image/ImageMetaData.java b/src/com/ample/icms/bean/image/ImageMetaData.java new file mode 100644 index 000000000..db19469a0 --- /dev/null +++ b/src/com/ample/icms/bean/image/ImageMetaData.java @@ -0,0 +1,22 @@ +package com.ample.icms.bean.image; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamImplicit; + +import java.util.List; + +@XStreamAlias("META_DATA") +public class ImageMetaData { + + @XStreamImplicit + private List imageBatchs ; + + public List getImageBatchs() { + return imageBatchs; + } + + public void setImageBatchs(List imageBatchs) { + this.imageBatchs = imageBatchs; + } + +} diff --git a/src/com/ample/icms/bean/image/ImageNode.java b/src/com/ample/icms/bean/image/ImageNode.java new file mode 100644 index 000000000..1843942dd --- /dev/null +++ b/src/com/ample/icms/bean/image/ImageNode.java @@ -0,0 +1,49 @@ +package com.ample.icms.bean.image; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamAsAttribute; + +import java.util.List; +@XStreamAlias("NODE") +public class ImageNode { + //影像资料归类代码 + @XStreamAlias("ID") + @XStreamAsAttribute + private String Id ; + + /** + * ADD：为新增 + * CLEAN_ADD：为整个资料分类下先删除再新增 + * MOD_ID：为根据PAGEID替换文件 + * DEL_ID：为根据PAGEID删除文件 + */ + @XStreamAlias("ACTION") + @XStreamAsAttribute + private String action ; + + private List page; + + public String getId() { + return Id; + } + + public void setId(String id) { + Id = id; + } + + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + } + + public List getPage() { + return page; + } + + public void setPage(List page) { + this.page = page; + } +} diff --git a/src/com/ample/icms/bean/image/ImagePage.java b/src/com/ample/icms/bean/image/ImagePage.java new file mode 100644 index 000000000..4c59c9cc1 --- /dev/null +++ b/src/com/ample/icms/bean/image/ImagePage.java @@ -0,0 +1,124 @@ +package com.ample.icms.bean.image; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamAsAttribute; + +@XStreamAlias("PAGE") +public class ImagePage { + //文件名称 + @XStreamAlias("FILE_NAME") + @XStreamAsAttribute + private String fileName ; + + //影像代码（在需要进行制定PAGEID删除和替换影像时需要传递） + @XStreamAlias("PAGEID") + @XStreamAsAttribute + private String pageId ; + + //影像序号（第三方系统图像编号，用于返回时告诉业务系统编号） + @XStreamAlias("FILE_NO") + @XStreamAsAttribute + private String fileNo ; + + //上传用户编号 + @XStreamAlias("UP_USER") + @XStreamAsAttribute + private String upUser ; + + //上传用户名称 + @XStreamAlias("UP_USER_NAME") + @XStreamAsAttribute + private String upUserName ; + + //上传用户机构编号 + @XStreamAlias("UP_ORG") + @XStreamAsAttribute + private String upOrg ; + + //上传用户机构名称 + @XStreamAlias("UP_ORGNAME") + @XStreamAsAttribute + private String upOrgName ; + + //上传时间 + @XStreamAlias("UP_TIME") + @XStreamAsAttribute + private String upTime ; + + //备注 + @XStreamAlias("REMARK") + @XStreamAsAttribute + private String remark ; + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getPageId() { + return pageId; + } + + public void setPageId(String pageId) { + this.pageId = pageId; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getUpUser() { + return upUser; + } + + public void setUpUser(String upUser) { + this.upUser = upUser; + } + + public String getUpUserName() { + return upUserName; + } + + public void setUpUserName(String upUserName) { + this.upUserName = upUserName; + } + + public String getUpOrg() { + return upOrg; + } + + public void setUpOrg(String upOrg) { + this.upOrg = upOrg; + } + + public String getUpOrgName() { + return upOrgName; + } + + public void setUpOrgName(String upOrgName) { + this.upOrgName = upOrgName; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } +} diff --git a/src/com/ample/icms/bean/image/ImagePages.java b/src/com/ample/icms/bean/image/ImagePages.java new file mode 100644 index 000000000..b75e1c789 --- /dev/null +++ b/src/com/ample/icms/bean/image/ImagePages.java @@ -0,0 +1,19 @@ +package com.ample.icms.bean.image; + +import com.thoughtworks.xstream.annotations.XStreamAlias; + +import java.util.List; + +@XStreamAlias("PAGES") +public class ImagePages { + + private List nodes; + + public List getNodes() { + return nodes; + } + + public void setNodes(List nodes) { + this.nodes = nodes; + } +} diff --git a/src/com/ample/icms/bean/ImageRoot.java b/src/com/ample/icms/bean/image/ImageRoot.java similarity index 92% rename from src/com/ample/icms/bean/ImageRoot.java rename to src/com/ample/icms/bean/image/ImageRoot.java index e933fc91b..c736dbb42 100644 --- a/src/com/ample/icms/bean/ImageRoot.java +++ b/src/com/ample/icms/bean/image/ImageRoot.java @@ -1,4 +1,4 @@ -package com.ample.icms.bean; +package com.ample.icms.bean.image; import com.thoughtworks.xstream.annotations.XStreamAlias; diff --git a/src/com/ample/icms/bean/ImageTree.java b/src/com/ample/icms/bean/image/ImageTree.java similarity index 93% rename from src/com/ample/icms/bean/ImageTree.java rename to src/com/ample/icms/bean/image/ImageTree.java index 985b87a72..43103650c 100644 --- a/src/com/ample/icms/bean/ImageTree.java +++ b/src/com/ample/icms/bean/image/ImageTree.java @@ -1,4 +1,4 @@ -package com.ample.icms.bean; +package com.ample.icms.bean.image; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; diff --git a/src/com/ample/icms/query/ImageCount.java b/src/com/ample/icms/query/ImageCount.java new file mode 100644 index 000000000..8e6b59814 --- /dev/null +++ b/src/com/ample/icms/query/ImageCount.java @@ -0,0 +1,13 @@ +package com.ample.icms.query; + +import com.ample.icms.service.ImageService; + +public class ImageCount extends ImageService { + + public String getResult(){ + this.setCode("ECM0006"); + String result = this.doPost(); + return result; + } + +} diff --git a/src/com/ample/icms/query/ImageQuery.java b/src/com/ample/icms/query/ImageQuery.java index f9a223bca..e3105dd04 100644 --- a/src/com/ample/icms/query/ImageQuery.java +++ b/src/com/ample/icms/query/ImageQuery.java @@ -1,7 +1,54 @@ package com.ample.icms.query; +import com.alibaba.fastjson.JSONArray; +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.awe.util.Transaction; +import com.ample.icms.bean.image.ImageBatch; +import com.ample.icms.bean.image.ImageMetaData; +import com.ample.icms.bean.image.ImageRoot; import com.ample.icms.service.ImageService; +import com.ample.icms.util.GetInfoUtil; + +import java.util.ArrayList; +import java.util.List; public class ImageQuery extends ImageService { + private String projectId; + private JSONArray allAppInfoJson; + public ImageRoot createData() throws Exception { + addBaseData(); + List batchs = new ArrayList<>(); + for(int i=0;i copyFile() throws JBOException { + public List copyFile() throws Exception { List files = new ArrayList<>(); BizObjectManager bom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME); List bos = bom.createQuery("sign_type='COMPLETE' and file_flag='yes' and project_id=:projectId and flow_unid=:flowUnid") @@ -144,7 +143,7 @@ public class ImageDownload extends ImageService { files.add(fileXML); return files; } - public void createXMl() { + public void createXMl() throws Exception { String appCode = "BQCW-000010"; String appName = "签约文件"; this.setAppCode(appCode); diff --git a/src/com/ample/icms/scan/ImageScan.java b/src/com/ample/icms/scan/ImageScan.java index b7ddb3bb6..52be66e03 100644 --- a/src/com/ample/icms/scan/ImageScan.java +++ b/src/com/ample/icms/scan/ImageScan.java @@ -1,6 +1,6 @@ package com.ample.icms.scan; -import com.ample.icms.bean.ImageBaseData; +import com.ample.icms.bean.image.ImageBaseData; import com.ample.icms.service.ImageService; public class ImageScan extends ImageService { diff --git a/src/com/ample/icms/scan/ImageUpload.java b/src/com/ample/icms/scan/ImageUpload.java index 8b657ca9c..67c3fd1b6 100644 --- a/src/com/ample/icms/scan/ImageUpload.java +++ b/src/com/ample/icms/scan/ImageUpload.java @@ -6,6 +6,8 @@ import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.are.util.StringFunction; import com.amarsoft.awe.util.SqlObject; import com.amarsoft.awe.util.Transaction; +import com.amarsoft.dict.als.manage.NameManager; +import com.ample.icms.bean.image.*; import com.ample.icms.service.ImageService; import com.ample.icms.util.GetInfoUtil; import com.ample.icms.util.PropertiesUtil; @@ -27,11 +29,57 @@ public class ImageUpload extends ImageService { private String projectId; private String flowUnid; private String flowNo; + private String projecNo; + private List files; private static final String FileSavePath = PropertiesUtil.get("fileSavePathTemp"); + + public List addNodes() throws Exception { + files = new ArrayList<>(); + List pages = new ArrayList<>(); + BizObjectManager bom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME); + List bos = bom.createQuery("sign_type='COMPLETE' and file_flag='yes' and project_id=:projectId and flow_unid=:flowUnid") + .setParameter("projectId",projectId).setParameter("flowUnid",flowUnid).getResultList(false); + for(BizObject bo : bos){ + String projectId = bo.getAttribute("project_id").toString(); + String fileName = bo.getAttribute("filename").toString(); + String inputUserId = bo.getAttribute("inputuserid").toString(); + String inputOrgId = bo.getAttribute("inputorgid").toString(); + String filePath = bo.getAttribute("fullpath").toString(); + + ImagePage page = new ImagePage(); + page.setFileName(fileName); + page.setUpUser(inputUserId); + page.setUpUserName(NameManager.getUserName(inputUserId)); + page.setUpOrg(inputOrgId); + page.setUpOrgName(NameManager.getOrgName(inputOrgId)); + page.setUpTime(StringFunction.getTodayNow()); + pages.add(page); + + File file = new File(filePath); + files.add(file); + } + ImageNode node = new ImageNode(); + //融资租赁合同套系 + node.setId("APZLJJ000080"); + node.setAction("ADD"); + node.setPage(pages); + List nodes = new ArrayList<>(); + nodes.add(node); + return nodes; + } + public ImageRoot createData() throws Exception { + addBaseData(); + ImagePages pages = addPages(addNodes()); + List batchs = new ArrayList<>(); + batchs.add(addBatch(appCode,appName,busiNo,pages)); + ImageMetaData metaData = addMetaData(batchs); + ImageRoot root = new ImageRoot(base,metaData); + return root; + } public String doUpload(){ // String zipPath = "C:/Users/ivanl/Desktop/影像系统/ECM4.0Demo/ECM4.0Demo/第三方上传/1111.zip"; - String zipPath = FileSavePath+"/"+flowUnid+".zip"; - String result = "0"; + String zipPath = FileSavePath+"/"+flowUnid+".zip"; + String result = "0"; try { AutoScanApi autoScanApi = new AutoScanApi(PropertiesUtil.get("service_ip"),8088,PropertiesUtil.get("secret_id")+"#"+PropertiesUtil.get("secret_key")); result = autoScanApi.ScanImageFile(appCode, zipPath); @@ -40,35 +88,18 @@ public class ImageUpload extends ImageService { } return result; } - public void intoLog(String code ,String msg) { - Transaction transaction = null; - Transaction.createTransaction("als"); - SqlObject so = null; - try { - so = new SqlObject("insert into icms_upload_log (flowunid,path,code,msg,inputtime) values (:flowunid,:path,:code,:msg,:inputtime)"); - so.setParameter("flowunid",flowUnid); - so.setParameter("path",""); - so.setParameter("code",code); - so.setParameter("msg",msg); - so.setParameter("inputtime", StringFunction.getTodayNow()); - transaction.executeSQL(so); - transaction.commit(); - } catch (Exception e) { - e.printStackTrace(); - } - - } public String upload() throws Exception { /** * 1.找出需要上传的影像 - * 3.在指定路径添加对应xml文件 - * 4.打包上传 - * 5.删除复制文件和打包文件 + * 2.在指定路径添加对应xml文件 + * 3.打包上传 + * 4.删除复制文件和打包文件 */ + createXMl(); FileOutputStream fos = new FileOutputStream(new File(FileSavePath+"/"+flowUnid+".zip")); ZipUtils zdo = new ZipUtils(); - zdo.toZip(copyFile(),fos); + zdo.toZip(files,fos); String result = doUpload(); String returnCode = result.substring(0,result.indexOf("@")); String returnMsg = result.substring(result.indexOf("@")+1,result.length()+1); @@ -89,22 +120,6 @@ public class ImageUpload extends ImageService { zdo.deleteFile(f,false); } } - public List copyFile() throws Exception { - List files = new ArrayList<>(); - BizObjectManager bom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME); - List bos = bom.createQuery("sign_type='COMPLETE' and file_flag='yes' and project_id=:projectId and flow_unid=:flowUnid") - .setParameter("projectId",projectId).setParameter("flowUnid",flowUnid).getResultList(false); - for(BizObject bo : bos){ - String filePath = bo.getAttribute("fullpath").toString(); - File file = new File(filePath); - files.add(file); - } - //todo 加上xml文件 - createXMl(); - File fileXML = new File(FileSavePath+"/"+flowUnid+".xml"); - files.add(fileXML); - return files; - } public void createXMl() throws Exception { getAppInfo(); String xml = getRequestXML(); @@ -129,7 +144,7 @@ public class ImageUpload extends ImageService { String[] app = appInfo.split("@"); this.setAppCode(app[0]); this.setAppName(app[1]); - this.setBusiNo(flowUnid); + this.setBusiNo(projecNo); } public String getProjectId() { @@ -156,4 +171,30 @@ public class ImageUpload extends ImageService { this.flowNo = flowNo; } + public String getProjecNo() { + return projecNo; + } + + public void setProjecNo(String projecNo) { + this.projecNo = projecNo; + } + + public void intoLog(String code ,String msg) { + Transaction transaction = null; + Transaction.createTransaction("als"); + SqlObject so = null; + try { + so = new SqlObject("insert into icms_upload_log (flowunid,path,code,msg,inputtime) values (:flowunid,:path,:code,:msg,:inputtime)"); + so.setParameter("flowunid",flowUnid); + so.setParameter("path",""); + so.setParameter("code",code); + so.setParameter("msg",msg); + so.setParameter("inputtime", StringFunction.getTodayNow()); + transaction.executeSQL(so); + transaction.commit(); + } catch (Exception e) { + e.printStackTrace(); + } + + } } diff --git a/src/com/ample/icms/service/ImageService.java b/src/com/ample/icms/service/ImageService.java index c85c95e12..1fb69fb4a 100644 --- a/src/com/ample/icms/service/ImageService.java +++ b/src/com/ample/icms/service/ImageService.java @@ -1,9 +1,6 @@ package com.ample.icms.service; -import com.ample.icms.bean.ImageBaseData; -import com.ample.icms.bean.ImageBatch; -import com.ample.icms.bean.ImageMetaData; -import com.ample.icms.bean.ImageRoot; +import com.ample.icms.bean.image.*; import com.ample.icms.util.PropertiesUtil; import com.sunyard.insurance.encode.client.EncodeAccessParam; import com.thoughtworks.xstream.XStream; @@ -16,9 +13,11 @@ import org.apache.log4j.Logger; import java.io.IOException; import java.util.ArrayList; +import java.util.List; -public class ImageService { +public abstract class ImageService { public Logger logger = Logger.getLogger(this.getClass()); + protected String allAppInfo; protected String appCode; protected String appName; protected String code; @@ -35,25 +34,40 @@ public class ImageService { base.setOrgName("安鹏国际融资租赁(深圳)有限公司"); base.setRoleCode("admin"); } - public void addBatch(){ - batch = new ImageBatch(); - batch.setAppCode(this.appCode); - batch.setAppName(this.appName); - batch.setBusiNo(this.busiNo); + + public void addNode(String id ,String action ,List page){ + ImageNode node = new ImageNode(); + node.setId(id); + node.setAction(action); + node.setPage(page); } - public void addMetaData(){ - metaData = new ImageMetaData(); - metaData.imageBatchs = new ArrayList<>(); - metaData.imageBatchs.add(batch); + public ImagePages addPages(List nodes){ + ImagePages pages = new ImagePages(); + pages.setNodes(nodes); + return pages; } - public ImageRoot createData(){ + public ImageBatch addBatch(String appCode, String appName, String busiNo, ImagePages pages) { + ImageBatch batch = new ImageBatch(); + batch.setAppCode(appCode); + batch.setAppName(appName); + batch.setBusiNo(busiNo); + batch.setPages(pages); + return batch; + } + public ImageMetaData addMetaData(List batchs){ + ImageMetaData metaData = new ImageMetaData(); + metaData.setImageBatchs(batchs); + return metaData; + } + public ImageRoot createData() throws Exception { addBaseData(); - addBatch(); - addMetaData(); + List batchs = new ArrayList<>(); + batchs.add(addBatch(appCode,appName,busiNo,null)); + ImageMetaData metaData = addMetaData(batchs); ImageRoot root = new ImageRoot(base,metaData); return root; } - public String getRequestXML(){ + public String getRequestXML() throws Exception { XStream xs = new XStream(); xs.processAnnotations(ImageRoot.class); String xml = xs.toXML(createData()); @@ -160,4 +174,12 @@ public class ImageService { public void setBusiNo(String busiNo) { this.busiNo = busiNo; } + public String getAllAppInfo() { + return allAppInfo; + } + + public void setAllAppInfo(String allAppInfo) { + this.allAppInfo = allAppInfo; + } + } diff --git a/src/com/ample/icms/util/GetInfoUtil.java b/src/com/ample/icms/util/GetInfoUtil.java index 1ab119ff9..d935d7229 100644 --- a/src/com/ample/icms/util/GetInfoUtil.java +++ b/src/com/ample/icms/util/GetInfoUtil.java @@ -1,6 +1,9 @@ package com.ample.icms.util; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.awe.util.ASResultSet; import com.amarsoft.awe.util.SqlObject; import com.amarsoft.awe.util.Transaction; @@ -9,7 +12,9 @@ import java.sql.SQLException; public class GetInfoUtil { private String flowUnid; + private String projectId; private String projectNo; + private String contractId; private String productId; private String flowNo; private String sTable; @@ -60,7 +65,11 @@ public class GetInfoUtil { String appInfo = this.getAppInfoByProjectNo(projectNo, flowNo, Sqlca); return appInfo; } - + public String getAppInfoByProjectNo(String projectNo,String flowNo,JBOTransaction tx) throws SQLException, JBOException { + Transaction Sqlca = Transaction.createTransaction(tx); + String appInfo = getAppInfoByProjectNo(projectNo,flowNo,Sqlca); + return appInfo; + } public String getAppInfoByProjectNo(String projectNo, String flowNo, Transaction Sqlca) throws SQLException, JBOException { String sql = "select app_code,app_name from icms_rela where flow_no='" + flowNo + "' and project_no='" + projectNo + "'"; SqlObject sql_icms = new SqlObject(sql); @@ -73,12 +82,74 @@ public class GetInfoUtil { } String appInfo = appCode + "@" + appName; if (appCode == null) { - return null; + String productId = getProductIdByProjectNo(projectNo,Sqlca); + appInfo = this.getAppInfoByProductId(productId, flowNo, Sqlca); } return appInfo; } + + public String getAllAppInfoByProjectIdRJMT(JBOTransaction tx) throws SQLException, JBOException { + return getAllAppInfoByProjectId(this.projectId,tx); + } + public String getAllAppInfoByProjectId(String projectId,JBOTransaction tx) throws SQLException, JBOException { + String projectNo = getProjectNoByProjectId(projectId,tx); + return getAllAppInfoByProjectNo(projectNo,tx); + } + public JSONArray getAllAppInfoJsonByProjectId(String projectId,JBOTransaction tx) throws SQLException, JBOException { + String projectNo = getProjectNoByProjectId(projectId,tx); + Transaction Sqlca = Transaction.createTransaction(tx); + return getAllAppInfoJsonByProjectNo(projectNo,Sqlca); + } + /** + * 根据项目编号和流程编号获取appCode和appName + * + * @return + * @throws SQLException + */ + public String getAllAppInfoByProjectNoRJM() throws SQLException, JBOException { + return getAllAppInfoByProjectNo(this.projectNo); + } + public String getAllAppInfoByProjectNoRJMT(JBOTransaction tx) throws SQLException, JBOException { + return getAllAppInfoByProjectNo(this.projectNo,tx); + } + public String getAllAppInfoByProjectNo(String projectNo) throws SQLException, JBOException { + Transaction Sqlca = Transaction.createTransaction("als"); + String appInfo = this.getAllAppInfoByProjectNo(projectNo, Sqlca); + return appInfo; + } + public String getAllAppInfoByProjectNo(String projectNo,JBOTransaction tx) throws SQLException, JBOException { + Transaction Sqlca = Transaction.createTransaction(tx); + String appInfo = this.getAllAppInfoByProjectNo(projectNo, Sqlca); + return appInfo; + } + + public String getAllAppInfoByProjectNo(String projectNo, Transaction Sqlca) throws SQLException { + return getAllAppInfoJsonByProjectNo(projectNo,Sqlca).toJSONString(); + } + public JSONArray getAllAppInfoJsonByProjectNo(String projectNo, Transaction Sqlca) throws SQLException { + String sql = "select app_code,app_name from icms_rela where project_no='" + projectNo + "'"; + SqlObject sql_icms = new SqlObject(sql); + ASResultSet rs = Sqlca.getASResultSet(sql_icms); + String appCode = null; + String appName = null; + JSONArray ja = new JSONArray(); + while (rs.next()) { + appCode = rs.getString("app_code"); + appName = rs.getString("app_name"); + JSONObject appInfo = new JSONObject(); + appInfo.put("app_code",appCode); + appInfo.put("app_name",appName); + appInfo.put("project_no",appName); + ja.add(appInfo); + } + if (appCode == null) { + return null; + } + return ja; + } + /** * 根据productId和流程编号获取appCode和appName * @@ -143,7 +214,48 @@ public class GetInfoUtil { } return projectNo; } - + /** + * 根据项目编号 + * + * @param tx + * @return + * @throws SQLException,JBOException + */ + public String getProjectNoByProjectIdRJMT(JBOTransaction tx) throws SQLException, JBOException { + Transaction Sqlca = Transaction.createTransaction(tx); + String projectNo = getProjectNoByProjectId(projectId,Sqlca); + return projectNo; + } + public String getProjectNoByProjectId(String projectId, JBOTransaction tx) throws SQLException, JBOException { + Transaction Sqlca = Transaction.createTransaction(tx); + String projectNo = getProjectNoByProjectId(projectId,Sqlca); + return projectNo; + } + public String getProjectNoByProjectId(String projectId, Transaction Sqlca) throws SQLException { + String sql = "select project_no from lb_project_info where id='" + projectId + "'"; + String projectNo = Sqlca.getString(new SqlObject(sql)); + return projectNo; + } + public String getProjectNoByContractIdRJMT(JBOTransaction tx) throws SQLException, JBOException { + Transaction Sqlca = Transaction.createTransaction(tx); + String projectNo = getProjectNoByContractId(contractId,Sqlca); + return projectNo; + } + public String getProjectNoByContractId(String contractId, JBOTransaction tx) throws SQLException, JBOException { + Transaction Sqlca = Transaction.createTransaction(tx); + String projectNo = getProjectNoByContractId(contractId,Sqlca); + return projectNo; + } + public String getProjectNoByContractId(String contractId,Transaction Sqlca) throws SQLException { + String sql = "select project_no from lb_project_info where id=(select project_id from lb_contract_info where id=')"+contractId+"'"; + String projectNo = Sqlca.getString(new SqlObject(sql)); + return projectNo; + } + public String getProjectIdByContractId(String contractId,Transaction Sqlca) throws SQLException { + String sql = "select project_id from lb_contract_info where id='"+contractId+"'"; + String projectNo = Sqlca.getString(new SqlObject(sql)); + return projectNo; + } /** * 根据流程编号 * @@ -171,6 +283,11 @@ public class GetInfoUtil { String productId = Sqlca.getString(new SqlObject(sql)); return productId; } + public String getProductIdByProjectNo(String projectNo, Transaction Sqlca) throws SQLException { + String sql = "select product_id from lb_project_info where project_no=')"+projectNo+"'"; + String productId = Sqlca.getString(new SqlObject(sql)); + return productId; + } public String getFlowUnid() { return flowUnid; @@ -212,4 +329,18 @@ public class GetInfoUtil { this.productId = productId; } + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + public String getContractId() { + return contractId; + } + + public void setContractId(String contractId) { + this.contractId = contractId; + } } diff --git a/src_jbo/jbo/app/tenwa/doc/LB_MAILARCHIVING_INFO.java b/src_jbo/jbo/app/tenwa/doc/LB_MAILARCHIVING_INFO.java new file mode 100644 index 000000000..e621b81d2 --- /dev/null +++ b/src_jbo/jbo/app/tenwa/doc/LB_MAILARCHIVING_INFO.java @@ -0,0 +1,39 @@ +package jbo.app.tenwa.doc; + +/** +* - JBO命名常量类

+* Note: This file is generated by ADE tools, dont modify it.
+ +*/ +public interface LB_MAILARCHIVING_INFO { + /** + *

+ * 代表本类映射的BizObjectClass + */ + public static final String CLASS_NAME = "jbo.app.tenwa.doc.LB_MAILARCHIVING_INFO"; + + public static final String ID = "ID"; + + public static final String PRODUCT_ID = "PRODUCT_ID"; + + public static final String PROJECT_NO = "PROJECT_NO"; + + public static final String PROJECT_ID = "PROJECT_ID"; + + public static final String CONTRACT_ID = "CONTRACT_ID"; + + public static final String MAILS_TATUS = "MAIL_STATUS"; + + public static final String HANDOVER_STATUS = "HANDOVER_STATUS"; + + public static final String APP_CODE = "APP_CODE"; + + public static final String APP_NAME = "APP_NAME"; + + public static final String NEW_FILE_CODE = "NEW_FILE_CODE"; + + public static final String NEW_FILE_NAME = "NEW_FILE_NAME"; + + public static final String IS_MUST = "IS_MUST"; + +} \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/doc/LB_MAILARCHIVING_INFO_TEMP.java b/src_jbo/jbo/app/tenwa/doc/LB_MAILARCHIVING_INFO_TEMP.java new file mode 100644 index 000000000..a7ece2508 --- /dev/null +++ b/src_jbo/jbo/app/tenwa/doc/LB_MAILARCHIVING_INFO_TEMP.java @@ -0,0 +1,41 @@ +package jbo.app.tenwa.doc; + +/** +* - JBO命名常量类

+* Note: This file is generated by ADE tools, dont modify it.
+ +*/ +public interface LB_MAILARCHIVING_INFO_TEMP { + /** + *

+ * 代表本类映射的BizObjectClass + */ + public static final String CLASS_NAME = "jbo.app.tenwa.doc.LB_MAILARCHIVING_INFO_TEMP"; + + public static final String ID = "ID"; + + public static final String PRODUCT_ID = "PRODUCT_ID"; + + public static final String PROJECT_NO = "PROJECT_NO"; + + public static final String PROJECT_ID = "PROJECT_ID"; + + public static final String CONTRACT_ID = "CONTRACT_ID"; + + public static final String MAILS_TATUS = "MAIL_STATUS"; + + public static final String HANDOVER_STATUS = "HANDOVER_STATUS"; + + public static final String APP_CODE = "APP_CODE"; + + public static final String APP_NAME = "APP_NAME"; + + public static final String NEW_FILE_CODE = "NEW_FILE_CODE"; + + public static final String NEW_FILE_NAME = "NEW_FILE_NAME"; + + public static final String IS_MUST = "IS_MUST"; + + public static final String FLOWUNID = "FLOWUNID"; + +} \ No newline at end of file diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/DocMailAction.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/DocMailAction.java index e1f143833..ee81d0307 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/DocMailAction.java +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/DocMailAction.java @@ -1,25 +1,24 @@ package com.tenwa.lease.flow.project.businessapply; +import com.amarsoft.are.jbo.*; +import com.amarsoft.are.util.StringFunction; +import com.amarsoft.awe.util.Transaction; +import com.ample.icms.query.ImageCount; +import com.ample.icms.util.GetInfoUtil; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import jbo.app.tenwa.doc.*; +import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT; +import org.dom4j.Document; +import org.dom4j.DocumentException; +import org.dom4j.DocumentHelper; +import org.dom4j.Element; + +import java.sql.SQLException; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; -import com.amarsoft.awe.util.Transaction; -import jbo.app.tenwa.doc.LB_FILE_MAILARCHIVING_INFO; -import jbo.app.tenwa.doc.LB_FILE_MAILARCHIVING_INFO_TEMP; -import jbo.app.tenwa.doc.LM_APPROVALOPINION_DOC; -import jbo.app.tenwa.doc.LM_APPROVALOPINION_DOC_TEMP; -import jbo.app.tenwa.doc.LM_MAILONLINE_DOC_TEMP; -import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT; - -import com.amarsoft.are.jbo.BizObject; -import com.amarsoft.are.jbo.BizObjectManager; -import com.amarsoft.are.jbo.JBOException; -import com.amarsoft.are.jbo.JBOFactory; -import com.amarsoft.are.jbo.JBOTransaction; -import com.amarsoft.are.util.StringFunction; -import com.tenwa.comm.util.jboutil.DataOperatorUtil; - public class DocMailAction { private String userid; @@ -42,6 +41,10 @@ public class DocMailAction { String [] contractlist = contractid.split("@"); Transaction Sqlca = Transaction.createTransaction(tx); for(String contractId:contractlist){ + String icmsResult = getDocList(contractId,tx); + if(!"sucess".equals(icmsResult)){ + return icmsResult; + } //邮寄状态 String ALLSTATUS = "none"; //总接收状态 @@ -76,6 +79,7 @@ public class DocMailAction { bo.setAttributeValue(LB_FILE_MAILARCHIVING_INFO_TEMP.opinion_comments, result); } lfmitBom.saveObject(bo); + fromCondtion.put("contract_id", contractId); otherProperty.put("flowunid", flowunid); DataOperatorUtil.copyJBOSet(LM_APPROVALOPINION_DOC.CLASS_NAME, fromCondtion,LM_APPROVALOPINION_DOC_TEMP.CLASS_NAME, null, otherProperty,null, tx); @@ -85,13 +89,14 @@ public class DocMailAction { } public String deleteReadyMailList(JBOTransaction tx) throws JBOException{ BizObjectManager lfmitBom = JBOFactory.getBizObjectManager(LB_FILE_MAILARCHIVING_INFO_TEMP.CLASS_NAME, tx); - BizObjectManager lmdtBom = JBOFactory.getBizObjectManager(LM_MAILONLINE_DOC_TEMP.CLASS_NAME, tx); + //BizObjectManager lmdtBom = JBOFactory.getBizObjectManager(LM_MAILONLINE_DOC_TEMP.CLASS_NAME, tx); + BizObjectManager lmaitBom = JBOFactory.getBizObjectManager(LB_MAILARCHIVING_INFO_TEMP.CLASS_NAME, tx); BizObjectManager ladtBom = JBOFactory.getBizObjectManager(LM_APPROVALOPINION_DOC_TEMP.CLASS_NAME, tx); String [] contractlist = contractid.split("@"); for(String contractId:contractlist){ lfmitBom.createQuery("delete from O where contract_id = '"+contractId+"' and flowunid='"+flowunid+"'").executeUpdate(); - lmdtBom.createQuery("delete from O where contract_id = '"+contractId+"' and flowunid='"+flowunid+"'").executeUpdate(); + lmaitBom.createQuery("delete from O where contract_id = '"+contractId+"' and flowunid='"+flowunid+"'").executeUpdate(); ladtBom.createQuery("delete from O where contract_id = '"+contractId+"' and flowunid='"+flowunid+"'").executeUpdate(); } return "success"; @@ -178,6 +183,62 @@ public class DocMailAction { fboManage.saveObject(fbo); return "success"; } + public String getDocList(String contractid,JBOTransaction tx) throws SQLException, JBOException, DocumentException { + Transaction Sqlca = Transaction.createTransaction(tx); + String responseCode = ""; + String responseMsg = "sucess"; + GetInfoUtil giu = new GetInfoUtil(); + String projectNo = giu.getProjectNoByContractId(contractid,tx); + String app = giu.getAppInfoByProjectNo(projectNo,"MortgageFileMailFlow",tx); + String [] appInfo = app.split("@"); + String appCode = appInfo[0]; + String appName = appInfo[1]; + if("0000".equals(appCode)){ + responseMsg = appName; + return responseMsg; + } + ImageCount ic = new ImageCount(); + ic.setAppCode(appCode); + ic.setAppName(appName); + ic.setBusiNo(projectNo); + String result = ic.getResult(); + if("0000".equals(result)){ + responseMsg = "连接影像系统失败，请及时联系管理员！"; + return responseMsg; + }else { + BizObjectManager lfmitBom = JBOFactory.getBizObjectManager(LB_MAILARCHIVING_INFO_TEMP.CLASS_NAME, tx); + Document dom = DocumentHelper.parseText(result); + Element root = dom.getRootElement(); + responseCode = root.element("RESPONSE_CODE").getTextTrim(); + if("400".equals(responseCode)){ + responseMsg = root.element("RESPONSE_MSG").getTextTrim(); + return responseMsg; + } + List nodes = root.element("ATREE_ALL").elements("NODE"); + for (Iterator it = nodes.iterator(); it.hasNext();){ + Element elm = (Element) it.next(); + String newFileCode = elm.element("DOC_CODE").getTextTrim(); + String newFileName = elm.element("DOC_NAME").getTextTrim(); + String isMust = elm.element("IS_MUST").getTextTrim(); + BizObject bo = lfmitBom.newObject(); + bo.setAttributeValue("PRODUCT_ID",giu.getProductIdByProjectNo(projectNo,Sqlca)); + bo.setAttributeValue("PROJECT_NO",projectNo); + bo.setAttributeValue("PROJECT_ID",giu.getProjectIdByContractId(contractid,Sqlca)); + bo.setAttributeValue("CONTRACT_ID",contractid); + bo.setAttributeValue("MAIL_STATUS","all"); + bo.setAttributeValue("HANDOVER_STATUS","none"); + bo.setAttributeValue("APP_CODE",appCode); + bo.setAttributeValue("APP_NAME",appName); + bo.setAttributeValue("NEW_FILE_CODE",newFileCode); + bo.setAttributeValue("NEW_FILE_NAME",newFileName); + bo.setAttributeValue("IS_MUST",isMust); + bo.setAttributeValue("FLOW_UNID",flowunid); + lfmitBom.saveObject(bo); + } + + } + return responseMsg; + } public String getUserid() { return userid; diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBFileMailTempToFormal.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBFileMailTempToFormal.java index 4ab69e56d..0cba5fbf8 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBFileMailTempToFormal.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBFileMailTempToFormal.java @@ -1,28 +1,16 @@ package com.tenwa.lease.flow.project.commbusiness; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import jbo.app.tenwa.calc.LC_RENT_PLAN; -import jbo.app.tenwa.calc.LC_RENT_PLAN_HIS; -import jbo.app.tenwa.doc.LB_FILE_MAILARCHIVING_INFO; -import jbo.app.tenwa.doc.LB_FILE_MAILARCHIVING_INFO_TEMP; -import jbo.app.tenwa.doc.LM_APPROVALOPINION_DOC; -import jbo.app.tenwa.doc.LM_APPROVALOPINION_DOC_TEMP; -import jbo.app.tenwa.doc.LM_MAILONLINE_DOC; -import jbo.app.tenwa.doc.LM_MAILONLINE_DOC_TEMP; - -import com.amarsoft.app.lc.workflow.action.GetFlowAction; import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.BizObjectManager; import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.awe.util.Transaction; import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.flow.baseBussion.BaseBussiness; -import com.tenwa.lease.flow.comm.service.LeaseFlowBaseService; -import com.tenwa.lease.flow.comm.service.ServiceOperatorEnum; -import com.tenwa.lease.flow.comm.serviceImp.LeaseFlowBaseServiceImp; +import jbo.app.tenwa.doc.*; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class LBFileMailTempToFormal extends BaseBussiness { @@ -35,10 +23,12 @@ public class LBFileMailTempToFormal extends BaseBussiness { MapotherProperty=new HashMap(); //获取所有邮寄的合同 BizObjectManager lfmiBom = JBOFactory.getBizObjectManager(LB_FILE_MAILARCHIVING_INFO_TEMP.CLASS_NAME, Sqlca); - BizObjectManager lmdtBom = JBOFactory.getBizObjectManager(LM_MAILONLINE_DOC_TEMP.CLASS_NAME, Sqlca); + //BizObjectManager lmdtBom = JBOFactory.getBizObjectManager(LM_MAILONLINE_DOC_TEMP.CLASS_NAME, Sqlca); + BizObjectManager lmatBom = JBOFactory.getBizObjectManager(LB_MAILARCHIVING_INFO_TEMP.CLASS_NAME, Sqlca); List lfmitlist = lfmiBom.createQuery("flowunid =:flowunid").setParameter("flowunid", flowUnid).getResultList(true); fromCondtion.put("flowunid", flowUnid); DataOperatorUtil.copyJBOSet(LM_APPROVALOPINION_DOC_TEMP.CLASS_NAME, fromCondtion, LM_APPROVALOPINION_DOC.CLASS_NAME, null, null, null, Sqlca); + DataOperatorUtil.copyJBOSet(LB_MAILARCHIVING_INFO_TEMP.CLASS_NAME, fromCondtion, LB_MAILARCHIVING_INFO.CLASS_NAME, null, null, null, Sqlca); for(BizObject bo:lfmitlist){ fromCondtion.put("flowunid", flowUnid); fromCondtion.put("contract_id", bo.getAttribute("contract_id").getString()); @@ -46,12 +36,12 @@ public class LBFileMailTempToFormal extends BaseBussiness { bo.setAttributeValue("is_flowing", "1"); lfmiBom.saveObject(bo); DataOperatorUtil.copySingleJBO(LB_FILE_MAILARCHIVING_INFO_TEMP.CLASS_NAME, fromCondtion, LB_FILE_MAILARCHIVING_INFO.CLASS_NAME,toCondtion, null, Sqlca); - List lmdtlist = lmdtBom.createQuery("flowunid=:flowunid and contract_id =:contract_id").setParameter("flowunid", flowUnid).setParameter("contract_id", bo.getAttribute("contract_id").getString()).getResultList(false); + /*List lmdtlist = lmatBom.createQuery("flowunid=:flowunid and contract_id =:contract_id").setParameter("flowunid", flowUnid).setParameter("contract_id", bo.getAttribute("contract_id").getString()).getResultList(false); for(BizObject bo1:lmdtlist){ fromCondtion.put("libraryid", bo1.getAttribute("libraryid").getString()); toCondtion.put("libraryid", bo1.getAttribute("libraryid").getString()); DataOperatorUtil.copySingleJBO(LM_MAILONLINE_DOC_TEMP.CLASS_NAME, fromCondtion, LM_MAILONLINE_DOC.CLASS_NAME,toCondtion, null,Sqlca); - } + }*/ fromCondtion.clear(); toCondtion.clear(); otherProperty.clear(); From 4e49195312b7b81d9aa371d4bc25603f900ac1dc Mon Sep 17 00:00:00 2001 From: ap007 Date: Fri, 24 Jun 2022 18:06:48 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E9=82=AE=E5=AF=84=E8=B5=84=E6=96=99?= =?UTF-8?q?=E5=BD=92=E6=A1=A3=E7=AD=89=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Apzl/FileUpload/LBMailArchivingList.jsp | 81 +++++++++++++++++++ .../Apzl/FileUpload/LBPlaceFileTempInfo.jsp | 10 +-- .../LBnotAllMailHndHandoverTempList.jsp | 8 +- .../LmApprovaloppinionDocTempList.jsp | 4 +- .../BusinessProjectTempInfo.jsp | 4 + WebContent/WEB-INF/etc/jbo/jbo_doc.xml | 4 +- src/com/ample/icms/query/ImageQuery.java | 26 ++++-- src/com/ample/icms/util/GetInfoUtil.java | 36 +++++++-- .../app/tenwa/doc/LB_MAILARCHIVING_INFO.java | 55 +++++++++---- .../tenwa/doc/LB_MAILARCHIVING_INFO_TEMP.java | 59 ++++++++++---- .../project/businessapply/DocMailAction.java | 34 +++++++- 11 files changed, 264 insertions(+), 57 deletions(-) create mode 100644 WebContent/Tenwa/Apzl/FileUpload/LBMailArchivingList.jsp diff --git a/WebContent/Tenwa/Apzl/FileUpload/LBMailArchivingList.jsp b/WebContent/Tenwa/Apzl/FileUpload/LBMailArchivingList.jsp new file mode 100644 index 000000000..b66f3ec23 --- /dev/null +++ b/WebContent/Tenwa/Apzl/FileUpload/LBMailArchivingList.jsp @@ -0,0 +1,81 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2019-07-11 + Content: + History Log: + */ + String flowunid = CurPage.getParameter("FlowUnid"); + String PhaseNo = CurPage.getParameter("PhaseNo"); + String projectNo = CurPage.getParameter("projectNo"); + String contractId = CurPage.getParameter("contract_id"); + String isHistory = CurPage.getParameter("IsHistory"); + String model = "LBMailArchivingListTemp"; + String params = flowunid+","+contractId; + if("true".equals(isHistory)){ + model = "LBMailArchivingList"; + params = contractId; + } + ASObjectModel doTemp = new ASObjectModel(model); + if("0010".equals(PhaseNo)){ + doTemp.setVisible("HANDOVER_STATUS", false); + } + if("0020".equals(PhaseNo)){ + doTemp.setReadOnly("MAIL_STATUS", true); + } +// doTemp.setLockCount(2); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; + //--设置为Grid风格-- + dwTemp.ReadOnly = "0"; //只读模式 + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(params); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] = { + {"0010".equals(CurPage.getParameter("PhaseNo"))&&!"true".equals(isHistory)?"true":"false","","Button","保存","保存邮寄状态","saveMailStatus()","","","",""}, + }; +%> +<%@include file="/Frame/resources/include/ui/include_list.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Apzl/FileUpload/LBPlaceFileTempInfo.jsp b/WebContent/Tenwa/Apzl/FileUpload/LBPlaceFileTempInfo.jsp index fabb48598..6325eac49 100644 --- a/WebContent/Tenwa/Apzl/FileUpload/LBPlaceFileTempInfo.jsp +++ b/WebContent/Tenwa/Apzl/FileUpload/LBPlaceFileTempInfo.jsp @@ -14,7 +14,7 @@ String sFlowNo= CurPage.getParameter("FlowNo"); String PhaseNo= CurPage.getParameter("PhaseNo"); String userName = CurUser.getUserName(); - + String isHistory = CurPage.getParameter("IsHistory"); sFlowNo = "MortgageFileMailFlow"; BizObject flow=GetFlowAction.getFlowBussinessObject(sFlowunid); String product=CurPage.getParameter("productId"); @@ -49,13 +49,13 @@ dwTemp.Style = "2";//freeform //dwTemp.ReadOnly = "-2";//只读模式 dwTemp.genHTMLObjectWindow(CurPage.getParameter("id")); - dwTemp.replaceColumn("placefile", "", CurPage.getObjectWindowOutput()); + dwTemp.replaceColumn("placefile", "", CurPage.getObjectWindowOutput()); dwTemp.replaceColumn("opinion", "", CurPage.getObjectWindowOutput()); String sButtons[][] = { {"true","All","Button","保存","保存所有修改","save()","","","",""}, {"false","All","Button","返回","返回列表","returnList()","","","",""}, - {"0020".equals(CurPage.getParameter("PhaseNo"))&&!"his".equals(type)?"true":"false","","Button","一键归档","一键归档","guidang()","","","",""}, + {"0020".equals(CurPage.getParameter("PhaseNo"))&&!"true".equals(isHistory)?"true":"false","All","Button","一键归档","一键归档","guidang()","","","",""}, }; // sButtonPosition = "south"; @@ -79,11 +79,11 @@ } //as_save(0,'frame_list.window.saveRecordForApprove()'); IE浏览器不起作用 - as_save(0,'$("#frame_list")[0].contentWindow.saveRecordForApprove();'); + as_save(0,'$("#frame_list")[0].contentWindow.saveAcrhivingStatus();'); } function guidang(){ - $("#frame_list")[0].contentWindow.guidang(); + $("#frame_list")[0].contentWindow.doAcrhiving(); } diff --git a/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverTempList.jsp b/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverTempList.jsp index 0c6b2c8cd..1a0c50513 100644 --- a/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverTempList.jsp +++ b/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverTempList.jsp @@ -124,7 +124,7 @@ var contract_id=getItemValue(0, i, "contract_id"); var ProductId=getItemValue(0, i, "PRODUCT_ID"); var id=getItemValue(0, i, "id"); - var sUrl="/Tenwa/Apzl/FileUpload/DocMailListMain.jsp"; + var sUrl="/Tenwa/Apzl/FileUpload/LBMailArchivingList.jsp"; if('0010'!='<%=PhaseNo%>'){ sUrl="/Tenwa/Apzl/FileUpload/LBPlaceFileTempInfo.jsp"; } @@ -204,13 +204,17 @@ function openFileList(projectId){ let url = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestUrl",""); let params = getRequestParam(projectId); + if(params=='error'){ + alert('未找到对应的影像配置，请联系管理员'); + return; + } if(params!=null){ post(url,params); } } function getRequestParam(projectId){ let code = 'ECM0002'; - let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParamByProjectId","projectId="+projectId+",code="+code); + let param = RunJavaMethodTrans("com.ample.icms.query.ImageQuery","getRequestParamByProjectIdJMT","projectId="+projectId+",code="+code); return param; } /** diff --git a/WebContent/Tenwa/Apzl/FileUpload/LmApprovaloppinionDocTempList.jsp b/WebContent/Tenwa/Apzl/FileUpload/LmApprovaloppinionDocTempList.jsp index 60f0911f7..6a42982d9 100644 --- a/WebContent/Tenwa/Apzl/FileUpload/LmApprovaloppinionDocTempList.jsp +++ b/WebContent/Tenwa/Apzl/FileUpload/LmApprovaloppinionDocTempList.jsp @@ -18,8 +18,8 @@ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 String sButtons[][] = { {"0010".equals(PhaseNo)?"false":"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, - {"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, - {"0010".equals(PhaseNo)?"false":"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, + {"true","All","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, + {"0010".equals(PhaseNo)?"false":"true","All","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, }; %><%@include file="/Frame/resources/include/ui/include_list.jspf"%> <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbContactInfo.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbContactInfo.jsp index b9179fd19..915c15608 100644 --- a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbContactInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbContactInfo.jsp @@ -5,6 +5,8 @@ Content: 示例详情页面 History Log: */ + String userId= CurUser.getUserID(); + String userName = CurUser.getUserName(); String sPrevUrl = CurPage.getParameter("PrevUrl"); String sFlowUnid = CurPage.getParameter("FlowUnid"); String sPhaseNo=CurPage.getParameter("PhaseNo");//阶段号 @@ -47,7 +49,7 @@ let url = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestUrl",""); let params = getRequestParam(); if(params!=null){ - post(url,params); + AsControl.postICMS(url,params); } } function getRequestParam(){ @@ -59,6 +61,10 @@ } let appCode = appInfo.substr(0,index); let appName = appInfo.substr(index+1,appInfo.length); + if(appCode=='0000'){ + alert(appName); + return; + } let code = 'ECM0002'; if("<%=sPhaseNo%>"=="0010"){ code = 'ECM0001'; @@ -67,28 +73,9 @@ if(busiNo==null||busiNo==""||busiNo=="null"){ busiNo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getProjectNoByFlowUnidRJM", "flowUnid=<%=sFlowUnid%>"); } - let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo); + let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo+",userCode=<%=userId%>"+",userName=<%=userName%>"); return param; } - /** - * 考虑防止一些浏览器的弹窗被阻止，不用ajax，而是用form表单提交的方式 - * @param URL - * @param PARAMS - */ - function post(URL, param) { - let temp_form = document.createElement("form"); - temp_form.action = URL; - temp_form.target = "_blank"; - temp_form.method = "post"; - temp_form.style.display = "none"; - let opt = document.createElement("textarea"); - opt.name = 'data'; - opt.value = param; - temp_form.appendChild(opt); - - document.body.appendChild(temp_form); - temp_form.submit(); - } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp index ddaff7e11..46020e1d6 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp @@ -7,6 +7,8 @@ Content: 示例详情页面 History Log: */ + String userId= CurUser.getUserID(); + String userName = CurUser.getUserName(); String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号 String sPhaseNo=CurPage.getParameter("PhaseNo");//阶段号 String FlowNo=CurPage.getParameter("FlowNo");//流程名称 @@ -178,7 +180,7 @@ let url = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestUrl",""); let params = getRequestParam(); if(params!=null){ - post(url,params); + AsControl.postICMS(url,params); } } function getRequestParam(){ @@ -195,35 +197,17 @@ return; } let code = 'ECM0002'; - if(("<%=sPhaseNo%>"=="0010")){ + if(("<%=FlowNo%>"=="BusinessApplyFlow"||"<%=FlowNo%>"=="BusinessChangeFlow")&&"<%=sPhaseNo%>"=="0010"){ code = 'ECM0001'; } let busiNo="<%=projectNo%>" if(busiNo==null||busiNo==""||busiNo=="null"){ busiNo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getProjectNoByFlowUnidRJM", "flowUnid=<%=sFlowUnid%>"); } - let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo); + let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo+",userCode=<%=userId%>"+",userName=<%=userName%>"); return param; } - /** - * 考虑防止一些浏览器的弹窗被阻止，不用ajax，而是用form表单提交的方式 - * @param URL - * @param PARAMS - */ - function post(URL, param) { - let temp_form = document.createElement("form"); - temp_form.action = URL; - temp_form.target = "_blank"; - temp_form.method = "post"; - temp_form.style.display = "none"; - let opt = document.createElement("textarea"); - opt.name = 'data'; - opt.value = param; - temp_form.appendChild(opt); - document.body.appendChild(temp_form); - temp_form.submit(); - } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp index 5e19eb7e3..54a4499d3 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp @@ -6,6 +6,8 @@ Content: 示例详情页面 History Log: */ + String userId= CurUser.getUserID(); + String userName = CurUser.getUserName(); String orgId = CurUser.getOrgID(); String ishistory = CurPage.getParameter("IsHistory"); String flowunid = CurPage.getParameter("FlowUnid"); @@ -18,7 +20,6 @@ //String corpusSource = Sqlca.getString("select corpus_source from LB_CONTRACT_INFO_TEMP where flowunid = '"+flowunid+"'"); String projectId = CurPage.getParameter("ProjectId"); String gpsVendor = Sqlca.getString("select cl.itemname from lb_project_info lpi left join LM_GPS_ORDER lgr on lgr.apply_no=lpi.project_no left join code_library cl on cl.itemno=lgr.source and cl.codeno='gpsVendor' where lpi.id='"+projectId+"'"); - String userId = CurUser.getUserID(); //gps来源 中瑞1 天易0 String source = Sqlca.getString("SELECT SOURCE from LM_GPS_ORDER where PROJECT_ID='"+projectId+"'"); String orderNo = Sqlca.getString("SELECT ORDER_NO from LM_GPS_ORDER where PROJECT_ID='"+projectId+"'"); @@ -175,7 +176,7 @@ window.onload = function(){ let url = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestUrl",""); let params = getRequestParam(); if(params!=null){ - post(url,params); + AsControl.postICMS(url,params); } } function getRequestParam(){ @@ -187,6 +188,10 @@ window.onload = function(){ } let appCode = appInfo.substr(0,index); let appName = appInfo.substr(index+1,appInfo.length); + if(appCode=='0000'){ + alert(appName); + return; + } let code = 'ECM0002'; if("<%=phaseNo%>"=="0010"){ code = 'ECM0001'; @@ -195,28 +200,9 @@ window.onload = function(){ if(busiNo==null||busiNo==""||busiNo=="null"){ busiNo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getProjectNoByFlowUnidRJM", "flowUnid=<%=flowunid%>"); } - let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo); + let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo+",userCode=<%=userId%>"+",userName=<%=userName%>"); return param; } - /** - * 考虑防止一些浏览器的弹窗被阻止，不用ajax，而是用form表单提交的方式 - * @param URL - * @param PARAMS - */ - function post(URL, param) { - let temp_form = document.createElement("form"); - temp_form.action = URL; - temp_form.target = "_blank"; - temp_form.method = "post"; - temp_form.style.display = "none"; - let opt = document.createElement("textarea"); - opt.name = 'data'; - opt.value = param; - temp_form.appendChild(opt); - - document.body.appendChild(temp_form); - temp_form.submit(); - } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/src/com/ample/icms/service/ImageService.java b/src/com/ample/icms/service/ImageService.java index 1fb69fb4a..be3b0a676 100644 --- a/src/com/ample/icms/service/ImageService.java +++ b/src/com/ample/icms/service/ImageService.java @@ -18,6 +18,8 @@ import java.util.List; public abstract class ImageService { public Logger logger = Logger.getLogger(this.getClass()); protected String allAppInfo; + protected String userCode; + protected String userName; protected String appCode; protected String appName; protected String code; @@ -25,10 +27,15 @@ public abstract class ImageService { protected ImageBaseData base; protected ImageBatch batch; protected ImageMetaData metaData; + public void addBaseData(){ base = new ImageBaseData(); - base.setUserCode("admin"); - base.setUserName("admin"); + if("".equals(userCode)||userCode==null){ + userCode = "system"; + userName = "system"; + } + base.setUserCode(userCode); + base.setUserName(userName); base.setOrgCode("0005"); base.setComCode("0005"); base.setOrgName("安鹏国际融资租赁(深圳)有限公司"); @@ -182,4 +189,19 @@ public abstract class ImageService { this.allAppInfo = allAppInfo; } + public String getUserCode() { + return userCode; + } + + public void setUserCode(String userCode) { + this.userCode = userCode; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } } From 8ef28c5c3ce86d2d9c0df8d6485dbf5b21ede1e0 Mon Sep 17 00:00:00 2001 From: ap007 Date: Tue, 5 Jul 2022 18:16:16 +0800 Subject: [PATCH 16/20] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=92=8C=E7=AC=AC=E4=B8=89=E6=96=B9=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LBnotAllMailHndHandoverTempList.jsp | 22 +-- .../Lessee/Person/CustomerCompanyTempInfo.jsp | 8 + .../Comm/LBContract/LBContractPrintList.jsp | 7 +- .../LBContractPersonBaseInfo.jsp | 5 +- .../MortgageFile/LbContactInfo.jsp | 54 +++--- .../BusinessProjectTempInfo.jsp | 6 +- .../BusinessApplication/CustomerInfo.jsp | 10 +- src/com/ample/icms/bean/image/ImageBatch.java | 23 +++ src/com/ample/icms/bean/image/ImageNode.java | 3 +- src/com/ample/icms/bean/image/ImagePages.java | 3 +- src/com/ample/icms/check/ImageCheck.java | 24 ++- src/com/ample/icms/init/IcmsRelationInit.java | 5 +- src/com/ample/icms/query/ImageQuery.java | 23 +-- src/com/ample/icms/scan/ImageUpload.java | 160 +++--------------- .../ample/icms/service/ImageQueryService.java | 120 +++++++++++++ src/com/ample/icms/service/ImageService.java | 18 ++ .../icms/service/ImageUploadService.java | 147 ++++++++++++++++ .../project/commcheck/IcmsDocListCheck.java | 4 +- 18 files changed, 423 insertions(+), 219 deletions(-) create mode 100644 src/com/ample/icms/service/ImageQueryService.java create mode 100644 src/com/ample/icms/service/ImageUploadService.java diff --git a/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverTempList.jsp b/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverTempList.jsp index 1a0c50513..575487c85 100644 --- a/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverTempList.jsp +++ b/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverTempList.jsp @@ -209,33 +209,15 @@ return; } if(params!=null){ - post(url,params); + AsControl.postICMS(url,params); } } function getRequestParam(projectId){ let code = 'ECM0002'; - let param = RunJavaMethodTrans("com.ample.icms.query.ImageQuery","getRequestParamByProjectIdJMT","projectId="+projectId+",code="+code); + let param = RunJavaMethodTrans("com.ample.icms.service.ImageQueryService","getRequestParamByProjectIdJMT","projectId="+projectId+",code="+code); return param; } - /** - * 考虑防止一些浏览器的弹窗被阻止，不用ajax，而是用form表单提交的方式 - * @param URL - * @param PARAMS - */ - function post(URL, param) { - let temp_form = document.createElement("form"); - temp_form.action = URL; - temp_form.target = "_blank"; - temp_form.method = "post"; - temp_form.style.display = "none"; - let opt = document.createElement("textarea"); - opt.name = 'data'; - opt.value = param; - temp_form.appendChild(opt); - document.body.appendChild(temp_form); - temp_form.submit(); - } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Customer/Lessee/Person/CustomerCompanyTempInfo.jsp b/WebContent/Tenwa/Customer/Lessee/Person/CustomerCompanyTempInfo.jsp index 7381c2037..c96470b7f 100644 --- a/WebContent/Tenwa/Customer/Lessee/Person/CustomerCompanyTempInfo.jsp +++ b/WebContent/Tenwa/Customer/Lessee/Person/CustomerCompanyTempInfo.jsp @@ -197,5 +197,13 @@ document.getElementById("NETCERTNAME").value = ''; } } + function getIdentity(){ + var certId = getItemValue(0,getRow(),"CERTID"); + return certId; + } + function getCustomerName(){ + var customerName = getItemValue(0,getRow(),"enterprisename"); + return customerName; + } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp index e5d249bac..495d24eb8 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp @@ -8,7 +8,7 @@ String custtype = CurPage.getParameter("CustomerType"); String PhaseNo = CurPage.getParameter("PhaseNo"); String projectId = CurPage.getParameter("ProjectId"); -// String signStatus = CurPage.getParameter("SignStatus"); + String ProjectNo = CurPage.getParameter("ProjectNo"); String contractNumber = CurPage.getParameter("ContractNumber"); String productId = CurPage.getParameter("ProductId"); String flowunid = CurPage.getParameter("FlowUnid"); @@ -55,8 +55,9 @@ <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp index 46020e1d6..27dcf44e3 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp @@ -200,11 +200,13 @@ if(("<%=FlowNo%>"=="BusinessApplyFlow"||"<%=FlowNo%>"=="BusinessChangeFlow")&&"<%=sPhaseNo%>"=="0010"){ code = 'ECM0001'; } - let busiNo="<%=projectNo%>" + let busiNo="<%=projectNo%>"; if(busiNo==null||busiNo==""||busiNo=="null"){ busiNo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getProjectNoByFlowUnidRJM", "flowUnid=<%=sFlowUnid%>"); } - let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo+",userCode=<%=userId%>"+",userName=<%=userName%>"); + let identity = $("#frame_list")[0].contentWindow.getIdentity(); + let customerName = $("#frame_list")[0].contentWindow.getCustomerName(); + let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo+",userCode=<%=userId%>"+",userName=<%=userName%>"+",identity="+identity+",customerName="+customerName); return param; } diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp index 8f431cd14..de5888cc2 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp @@ -693,7 +693,7 @@ } function ValidityCheck(){ - if(<%=customerType%> == '03'){ //个人客户 + if('<%=customerType%>' == '03'){ //个人客户 //校验证件类型为身份证或临时身份证时，出生日期是否同证件编号中的日期一致 var certType = getItemValue(0,getRow(),"CERTTYPE"); var certID = getItemValue(0,getRow(),"CERTID"); @@ -898,5 +898,13 @@ var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoCheck","checkCertIdAll",sParams); return sReturnInfo; } + function getIdentity(){ + var certId = getItemValue(0,getRow(),"CERTID"); + return certId; + } + function getCustomerName(){ + var customerName = getItemValue(0,getRow(),"FULLNAME"); + return customerName; + } <%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/src/com/ample/icms/bean/image/ImageBatch.java b/src/com/ample/icms/bean/image/ImageBatch.java index f1413cf06..c56bfd85e 100644 --- a/src/com/ample/icms/bean/image/ImageBatch.java +++ b/src/com/ample/icms/bean/image/ImageBatch.java @@ -17,6 +17,14 @@ public class ImageBatch { @XStreamAlias("BUSI_NO") private String busiNo ; + //客户身份证号 + @XStreamAlias("IDENTITY") + private String identity; + //客户名称 + + @XStreamAlias("CUSTOMER_NAME") + private String customerName; + //业务扩展索引(非必填) @XStreamAlias("CARNO") private String carNo ; @@ -89,4 +97,19 @@ public class ImageBatch { public void setPages(ImagePages pages) { this.pages = pages; } + public String getIdentity() { + return identity; + } + + public void setIdentity(String identity) { + this.identity = identity; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } } diff --git a/src/com/ample/icms/bean/image/ImageNode.java b/src/com/ample/icms/bean/image/ImageNode.java index 1843942dd..4c149c964 100644 --- a/src/com/ample/icms/bean/image/ImageNode.java +++ b/src/com/ample/icms/bean/image/ImageNode.java @@ -2,6 +2,7 @@ package com.ample.icms.bean.image; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +import com.thoughtworks.xstream.annotations.XStreamImplicit; import java.util.List; @XStreamAlias("NODE") @@ -20,7 +21,7 @@ public class ImageNode { @XStreamAlias("ACTION") @XStreamAsAttribute private String action ; - + @XStreamImplicit private List page; public String getId() { diff --git a/src/com/ample/icms/bean/image/ImagePages.java b/src/com/ample/icms/bean/image/ImagePages.java index b75e1c789..337480d4c 100644 --- a/src/com/ample/icms/bean/image/ImagePages.java +++ b/src/com/ample/icms/bean/image/ImagePages.java @@ -1,12 +1,13 @@ package com.ample.icms.bean.image; import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamImplicit; import java.util.List; @XStreamAlias("PAGES") public class ImagePages { - + @XStreamImplicit private List nodes; public List getNodes() { diff --git a/src/com/ample/icms/check/ImageCheck.java b/src/com/ample/icms/check/ImageCheck.java index afa7a6405..9fa850a6a 100644 --- a/src/com/ample/icms/check/ImageCheck.java +++ b/src/com/ample/icms/check/ImageCheck.java @@ -10,17 +10,31 @@ public class ImageCheck extends ImageService { public String getResult() throws DocumentException { this.setCode("ECM0013"); String result = this.doPost(); - String responseCode = ""; + return result; + } + public String resultAnalysis(String result) throws DocumentException { + String falg = "false"; String responseMsg = ""; if("0000".equals(result)){ - responseCode = "0000"; responseMsg = "连接影像系统失败，请及时联系管理员！"; }else { Document dom = DocumentHelper.parseText(result); Element root = dom.getRootElement(); - responseCode = root.element("RESPONSE_CODE").getTextTrim(); - responseMsg = root.element("RESPONSE_MSG").getTextTrim(); + String responseCode = root.element("RESPONSE_CODE").getTextTrim(); + String batchVer = root.element("BATCH_VER").getTextTrim(); + if("200".equals(responseCode)){ + falg = "true"; + responseMsg = "资料已提交"; + } + if("400".equals(responseCode)){ + if("0".equals(batchVer)){ + responseMsg = "资料未上传"; + }else { + responseMsg = root.element("RESPONSE_MSG").getTextTrim(); + } + + } } - return responseCode+"@"+responseMsg; + return falg+"@"+responseMsg; } } diff --git a/src/com/ample/icms/init/IcmsRelationInit.java b/src/com/ample/icms/init/IcmsRelationInit.java index db3f8e840..93249e668 100644 --- a/src/com/ample/icms/init/IcmsRelationInit.java +++ b/src/com/ample/icms/init/IcmsRelationInit.java @@ -16,13 +16,14 @@ public class IcmsRelationInit extends BaseBussiness { BizObject boLPIT = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME,tx).createQuery("flowunid=:flowunid").setParameter("flowunid",this.getAttribute("ObjectNo").toString()).getSingleResult(false); String projectNo = boLPIT.getAttribute("project_no").toString(); String productId = boLPIT.getAttribute("product_id").toString(); - SqlObject sql_icms = new SqlObject("select flowno,app_code,app_name from icms_prd_rela where productid='"+productId+"' group by flowno,app_code"); + SqlObject sql_icms = new SqlObject("select flowno,app_code,app_name,is_must from icms_prd_rela where productid='"+productId+"' group by flowno,app_code"); ASResultSet rs = Sqlca.getASResultSet(sql_icms); while (rs.next()){ String flowNo = rs.getString("flowno"); String appCode = rs.getString("app_code"); String appName = rs.getString("app_name"); - SqlObject sql_rela = new SqlObject("insert into icms_rela (id,project_no,flow_no,app_code,app_name) values(REPLACE(UUID(), '-', ''),'"+projectNo+"','"+flowNo+"','"+appCode+"','"+appName+"')"); + String isMust = rs.getString("is_must"); + SqlObject sql_rela = new SqlObject("insert into icms_rela (id,project_no,flow_no,app_code,app_name,is_must) values(REPLACE(UUID(), '-', ''),'"+projectNo+"','"+flowNo+"','"+appCode+"','"+appName+"','"+isMust+"')"); Sqlca.executeSQL(sql_rela); } String sMessage="true"; diff --git a/src/com/ample/icms/query/ImageQuery.java b/src/com/ample/icms/query/ImageQuery.java index afc816c18..de4079208 100644 --- a/src/com/ample/icms/query/ImageQuery.java +++ b/src/com/ample/icms/query/ImageQuery.java @@ -1,13 +1,10 @@ package com.ample.icms.query; import com.alibaba.fastjson.JSONArray; -import com.amarsoft.are.jbo.JBOTransaction; -import com.amarsoft.awe.util.Transaction; import com.ample.icms.bean.image.ImageBatch; import com.ample.icms.bean.image.ImageMetaData; import com.ample.icms.bean.image.ImageRoot; import com.ample.icms.service.ImageService; -import com.ample.icms.util.GetInfoUtil; import java.util.ArrayList; import java.util.List; @@ -30,23 +27,19 @@ public class ImageQuery extends ImageService { batchs.add(addBatch(appCode,appName,busiNo,null)); } }else { - batchs.add(addBatch(appCode,appName,busiNo,null)); + ImageBatch batch = new ImageBatch(); + batch.setAppCode(appCode); + batch.setAppName(appName); + batch.setBusiNo(busiNo); + batch.setIdentity(identity); + batch.setCustomerName(customerName); + batchs.add(batch); } ImageMetaData metaData = addMetaData(batchs); ImageRoot root = new ImageRoot(base,metaData); return root; } - public String getRequestParamByProjectIdJMT(JBOTransaction tx) throws Exception { - Transaction Sqlca = Transaction.createTransaction(tx); - GetInfoUtil gif = new GetInfoUtil(); - this.setBusiNo(gif.getProjectNoByProjectId(projectId,Sqlca)); - JSONArray ja = gif.getAllAppInfoJsonByProjectId(projectId,Sqlca); - if(ja==null){ - return "error"; - } - this.setAllAppInfoJson(ja); - return transformXMLtoParam(this.code,this.getRequestXML()); - } + public String getProjectId() { diff --git a/src/com/ample/icms/scan/ImageUpload.java b/src/com/ample/icms/scan/ImageUpload.java index 67c3fd1b6..2a730ef9c 100644 --- a/src/com/ample/icms/scan/ImageUpload.java +++ b/src/com/ample/icms/scan/ImageUpload.java @@ -1,66 +1,31 @@ package com.ample.icms.scan; -import com.amarsoft.are.jbo.BizObject; -import com.amarsoft.are.jbo.BizObjectManager; -import com.amarsoft.are.jbo.JBOFactory; -import com.amarsoft.are.util.StringFunction; -import com.amarsoft.awe.util.SqlObject; -import com.amarsoft.awe.util.Transaction; -import com.amarsoft.dict.als.manage.NameManager; import com.ample.icms.bean.image.*; import com.ample.icms.service.ImageService; -import com.ample.icms.util.GetInfoUtil; import com.ample.icms.util.PropertiesUtil; import com.sunyard.insurance.ecm.socket.client.AutoScanApi; -import com.tenwa.officetempalte.exportcallback.impl.ZipUtils; -import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST; import org.dom4j.Document; import org.dom4j.DocumentException; import org.dom4j.io.OutputFormat; import org.dom4j.io.SAXReader; import org.dom4j.io.XMLWriter; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; public class ImageUpload extends ImageService { - private String projectId; - private String flowUnid; - private String flowNo; - private String projecNo; - private List files; + private List pageList; private static final String FileSavePath = PropertiesUtil.get("fileSavePathTemp"); - public List addNodes() throws Exception { - files = new ArrayList<>(); - List pages = new ArrayList<>(); - BizObjectManager bom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME); - List bos = bom.createQuery("sign_type='COMPLETE' and file_flag='yes' and project_id=:projectId and flow_unid=:flowUnid") - .setParameter("projectId",projectId).setParameter("flowUnid",flowUnid).getResultList(false); - for(BizObject bo : bos){ - String projectId = bo.getAttribute("project_id").toString(); - String fileName = bo.getAttribute("filename").toString(); - String inputUserId = bo.getAttribute("inputuserid").toString(); - String inputOrgId = bo.getAttribute("inputorgid").toString(); - String filePath = bo.getAttribute("fullpath").toString(); - - ImagePage page = new ImagePage(); - page.setFileName(fileName); - page.setUpUser(inputUserId); - page.setUpUserName(NameManager.getUserName(inputUserId)); - page.setUpOrg(inputOrgId); - page.setUpOrgName(NameManager.getOrgName(inputOrgId)); - page.setUpTime(StringFunction.getTodayNow()); - pages.add(page); - - File file = new File(filePath); - files.add(file); - } + public List addNodes(List pages) throws Exception { ImageNode node = new ImageNode(); //融资租赁合同套系 - node.setId("APZLJJ000080"); + node.setId("APZLJJ000400"); node.setAction("ADD"); node.setPage(pages); List nodes = new ArrayList<>(); @@ -69,59 +34,21 @@ public class ImageUpload extends ImageService { } public ImageRoot createData() throws Exception { addBaseData(); - ImagePages pages = addPages(addNodes()); + ImagePages pages = addPages(addNodes(pageList)); List batchs = new ArrayList<>(); batchs.add(addBatch(appCode,appName,busiNo,pages)); ImageMetaData metaData = addMetaData(batchs); ImageRoot root = new ImageRoot(base,metaData); return root; } - public String doUpload(){ - // String zipPath = "C:/Users/ivanl/Desktop/影像系统/ECM4.0Demo/ECM4.0Demo/第三方上传/1111.zip"; - String zipPath = FileSavePath+"/"+flowUnid+".zip"; + public String doUpload(String zipPath) throws Exception { String result = "0"; - try { - AutoScanApi autoScanApi = new AutoScanApi(PropertiesUtil.get("service_ip"),8088,PropertiesUtil.get("secret_id")+"#"+PropertiesUtil.get("secret_key")); - result = autoScanApi.ScanImageFile(appCode, zipPath); - } catch (Exception e) { - e.printStackTrace(); - } + AutoScanApi autoScanApi = new AutoScanApi(PropertiesUtil.get("service_ip"),8088,PropertiesUtil.get("secret_id")+"#"+PropertiesUtil.get("secret_key")); + result = autoScanApi.ScanImageFile(appCode, zipPath); return result; } - public String upload() throws Exception { - /** - * 1.找出需要上传的影像 - * 2.在指定路径添加对应xml文件 - * 3.打包上传 - * 4.删除复制文件和打包文件 - */ - createXMl(); - FileOutputStream fos = new FileOutputStream(new File(FileSavePath+"/"+flowUnid+".zip")); - ZipUtils zdo = new ZipUtils(); - zdo.toZip(files,fos); - String result = doUpload(); - String returnCode = result.substring(0,result.indexOf("@")); - String returnMsg = result.substring(result.indexOf("@")+1,result.length()+1); - if(returnCode == "1"){ - deleteTemp(); - }; - intoLog(returnCode,returnMsg); - return returnMsg; - } - - /** - * 上传成功后再删除 - */ - public void deleteTemp(){ - File f = new File(FileSavePath); - if(f.length()!=0){ - ZipUtils zdo = new ZipUtils(); - zdo.deleteFile(f,false); - } - } - public void createXMl() throws Exception { - getAppInfo(); + public String createXMl() throws Exception { String xml = getRequestXML(); SAXReader saxReader = new SAXReader(); Document document; @@ -129,72 +56,25 @@ public class ImageUpload extends ImageService { document = saxReader.read(new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8))); OutputFormat format = OutputFormat.createPrettyPrint(); format.setEncoding("UTF-8"); - XMLWriter writer = new XMLWriter(new FileWriter(new File(FileSavePath+"/"+flowUnid+".xml")),format); + XMLWriter writer = new XMLWriter(new FileWriter(new File(FileSavePath+"/busi.xml")),format); writer.write(document); writer.close(); + return FileSavePath+"/busi.xml"; } catch (DocumentException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } - } - public void getAppInfo() throws Exception { - GetInfoUtil gif = new GetInfoUtil(); - String appInfo = gif.getAppInfoByFlowUnid(flowUnid); - String[] app = appInfo.split("@"); - this.setAppCode(app[0]); - this.setAppName(app[1]); - this.setBusiNo(projecNo); + return "error"; } - public String getProjectId() { - return projectId; + + public List getPageList() { + return pageList; } - public void setProjectId(String projectId) { - this.projectId = projectId; + public void setPageList(List pageList) { + this.pageList = pageList; } - public String getFlowUnid() { - return flowUnid; - } - - public void setFlowUnid(String flowUnid) { - this.flowUnid = flowUnid; - } - - public String getFlowNo() { - return flowNo; - } - - public void setFlowNo(String flowNo) { - this.flowNo = flowNo; - } - - public String getProjecNo() { - return projecNo; - } - - public void setProjecNo(String projecNo) { - this.projecNo = projecNo; - } - - public void intoLog(String code ,String msg) { - Transaction transaction = null; - Transaction.createTransaction("als"); - SqlObject so = null; - try { - so = new SqlObject("insert into icms_upload_log (flowunid,path,code,msg,inputtime) values (:flowunid,:path,:code,:msg,:inputtime)"); - so.setParameter("flowunid",flowUnid); - so.setParameter("path",""); - so.setParameter("code",code); - so.setParameter("msg",msg); - so.setParameter("inputtime", StringFunction.getTodayNow()); - transaction.executeSQL(so); - transaction.commit(); - } catch (Exception e) { - e.printStackTrace(); - } - - } } diff --git a/src/com/ample/icms/service/ImageQueryService.java b/src/com/ample/icms/service/ImageQueryService.java new file mode 100644 index 000000000..6c5482d51 --- /dev/null +++ b/src/com/ample/icms/service/ImageQueryService.java @@ -0,0 +1,120 @@ +package com.ample.icms.service; + +import com.alibaba.fastjson.JSONArray; +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.awe.util.Transaction; +import com.ample.icms.query.ImageQuery; +import com.ample.icms.util.GetInfoUtil; + +public class ImageQueryService { + private String code; + private String projectId; + private String flowUnid; + private String userCode; + private String userName; + private String projectNo; + private String flowNo; + public String getRequestParamByFlowNoRJM() throws Exception { + GetInfoUtil gif = new GetInfoUtil(); + String projectNo = gif.getProjectNoByFlowUnid(flowUnid); + String app = gif.getAppInfoByProjectNo(projectNo,flowNo); + String[] appInfo = app.split("@"); + ImageQuery iq = new ImageQuery(); + iq.setBusiNo(projectNo); + if("0000".equals(appInfo[0])){ + return app; + } + iq.setAppCode(appInfo[0]); + iq.setAppName(appInfo[1]); + iq.setUserCode(userCode); + iq.setUserName(userName); + return iq.transformXMLtoParam(this.code,iq.getRequestXML()); + } + public String getRequestParamByFlowUnidRJM() throws Exception { + GetInfoUtil gif = new GetInfoUtil(); + String projectNo = gif.getProjectNoByFlowUnid(flowUnid); + String app = gif.getAppInfoByFlowUnid(flowUnid); + String[] appInfo = app.split("@"); + ImageQuery iq = new ImageQuery(); + iq.setBusiNo(projectNo); + if("0000".equals(appInfo[0])){ + return app; + } + iq.setAppCode(appInfo[0]); + iq.setAppName(appInfo[1]); + iq.setUserCode(userCode); + iq.setUserName(userName); + return iq.transformXMLtoParam(this.code,iq.getRequestXML()); + } + public String getRequestParamByProjectIdJMT(JBOTransaction tx) throws Exception { + Transaction Sqlca = Transaction.createTransaction(tx); + GetInfoUtil gif = new GetInfoUtil(); + String projectNo = gif.getProjectNoByProjectId(projectId,Sqlca); + JSONArray ja = gif.getAllAppInfoJsonByProjectId(projectId,Sqlca); + if(ja==null){ + return "error"; + } + ImageQuery iq = new ImageQuery(); + iq.setBusiNo(projectNo); + iq.setAllAppInfoJson(ja); + iq.setUserCode(userCode); + iq.setUserName(userName); + return iq.transformXMLtoParam(this.code,iq.getRequestXML()); + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getFlowUnid() { + return flowUnid; + } + + public void setFlowUnid(String flowUnid) { + this.flowUnid = flowUnid; + } + + public String getUserCode() { + return userCode; + } + + public void setUserCode(String userCode) { + this.userCode = userCode; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getProjectNo() { + return projectNo; + } + + public void setProjectNo(String projectNo) { + this.projectNo = projectNo; + } + + public String getFlowNo() { + return flowNo; + } + + public void setFlowNo(String flowNo) { + this.flowNo = flowNo; + } +} diff --git a/src/com/ample/icms/service/ImageService.java b/src/com/ample/icms/service/ImageService.java index be3b0a676..229a11267 100644 --- a/src/com/ample/icms/service/ImageService.java +++ b/src/com/ample/icms/service/ImageService.java @@ -20,6 +20,8 @@ public abstract class ImageService { protected String allAppInfo; protected String userCode; protected String userName; + protected String identity; + protected String customerName ; protected String appCode; protected String appName; protected String code; @@ -204,4 +206,20 @@ public abstract class ImageService { public void setUserName(String userName) { this.userName = userName; } + + public String getIdentity() { + return identity; + } + + public void setIdentity(String identity) { + this.identity = identity; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } } diff --git a/src/com/ample/icms/service/ImageUploadService.java b/src/com/ample/icms/service/ImageUploadService.java new file mode 100644 index 000000000..fc36f80cf --- /dev/null +++ b/src/com/ample/icms/service/ImageUploadService.java @@ -0,0 +1,147 @@ +package com.ample.icms.service; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.are.util.StringFunction; +import com.amarsoft.dict.als.manage.NameManager; +import com.ample.icms.bean.image.ImagePage; +import com.ample.icms.scan.ImageUpload; +import com.ample.icms.util.GetInfoUtil; +import com.ample.icms.util.PropertiesUtil; +import com.tenwa.officetempalte.exportcallback.impl.ZipUtils; +import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST; +import org.apache.commons.io.FileUtils; + +import java.io.File; +import java.io.FileOutputStream; +import java.util.ArrayList; +import java.util.List; + +public class ImageUploadService { + private String projectId; + private String flowUnid; + private String projectNo; + private String flowNo; + private final String FILE_SAVE_PATH_TEMP = PropertiesUtil.get("fileSavePathTemp"); + public List getFileBo() throws JBOException { + BizObjectManager bom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME); + List bos = bom.createQuery("sign_type='COMPLETE' and file_flag='yes' and project_id=:projectId and flow_unid=:flowUnid") + .setParameter("projectId",projectId).setParameter("flowUnid",flowUnid).getResultList(false); + return bos; + } + public List getFile(List bos) throws Exception { + List files = new ArrayList<>(); + for(BizObject bo : bos){ + String fileName = bo.getAttribute("filename").toString(); + String filePath = bo.getAttribute("fullpath").toString(); + + File srcFile = new File(filePath); + File destFile = new File(FILE_SAVE_PATH_TEMP+"/"+fileName); + if(!destFile.getParentFile().exists()){ + destFile.getParentFile().mkdirs(); + } + FileUtils.copyFile(srcFile, destFile, true); + files.add(destFile); + } + return files; + } + public List getPages(List bos) throws Exception { + List pages = new ArrayList<>(); + for(BizObject bo : bos){ + String fileName = bo.getAttribute("filename").toString(); + String inputUserId = bo.getAttribute("inputuserid").toString(); + String inputOrgId = bo.getAttribute("inputorgid").toString(); + + ImagePage page = new ImagePage(); + page.setFileName(fileName); + page.setUpUser(inputUserId); + page.setUpUserName(NameManager.getUserName(inputUserId)); + page.setUpOrg(inputOrgId); + page.setUpOrgName(NameManager.getOrgName(inputOrgId)); + page.setUpTime(StringFunction.getTodayNow()); + pages.add(page); + } + return pages; + } + public String[] getAppInfo() throws Exception { + GetInfoUtil gif = new GetInfoUtil(); + String appInfo = gif.getAppInfoByProjectNo(projectNo,flowNo); + String[] app = appInfo.split("@"); + return app; + } + public String upload() throws Exception { + /** + * 1.找出需要上传的影像 + * 2.在指定路径添加对应xml文件 + * 3.打包上传 + * 4.删除复制文件和打包文件 + */ + + List boList = this.getFileBo(); + List files = this.getFile(boList); + List pageList = this.getPages(boList); + + ImageUpload imageUp = new ImageUpload(); + String[] appInfo = this.getAppInfo(); + imageUp.setAppCode(appInfo[0]); + imageUp.setAppName(appInfo[1]); + imageUp.setBusiNo(projectNo); + imageUp.setPageList(pageList); + String xmlUrl = imageUp.createXMl(); + + files.add(new File(xmlUrl)); + String zipUrl = FILE_SAVE_PATH_TEMP+"/"+flowUnid+".zip"; + FileOutputStream fos = new FileOutputStream(new File(zipUrl)); + ZipUtils zdo = new ZipUtils(); + zdo.toZip(files,fos); + String result = imageUp.doUpload(zipUrl); + String returnCode = result.substring(0,result.indexOf("@")); + String returnMsg = result.substring(result.indexOf("@")+1,result.length()); + // deleteTemp(); + return returnMsg; + } + /** + * 上传成功后再删除 + */ + public void deleteTemp(){ + File f = new File(FILE_SAVE_PATH_TEMP); + if(f.length()!=0){ + ZipUtils zdo = new ZipUtils(); + zdo.deleteFile(f,false); + } + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getFlowUnid() { + return flowUnid; + } + + public void setFlowUnid(String flowUnid) { + this.flowUnid = flowUnid; + } + + public String getProjectNo() { + return projectNo; + } + + public void setProjectNo(String projectNo) { + this.projectNo = projectNo; + } + + public String getFlowNo() { + return flowNo; + } + + public void setFlowNo(String flowNo) { + this.flowNo = flowNo; + } +} diff --git a/src_tenwa/com/tenwa/lease/flow/project/commcheck/IcmsDocListCheck.java b/src_tenwa/com/tenwa/lease/flow/project/commcheck/IcmsDocListCheck.java index b43ef1e48..408626f99 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commcheck/IcmsDocListCheck.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commcheck/IcmsDocListCheck.java @@ -34,9 +34,9 @@ public class IcmsDocListCheck extends AlarmBiz { ic.setAppCode(appCode); ic.setAppName(appName); ic.setBusiNo(projectNo); - String result = ic.getResult(); + String result =ic.resultAnalysis(ic.getResult()); String[] resultInfo = result.split("@"); - if("200".equals(resultInfo[0])){ + if("true".equals(resultInfo[0])){ setPass(true); }else{ setPass(false); From 75df22d142662b6a388800c3a91b6189350d70ff Mon Sep 17 00:00:00 2001 From: ap007 Date: Mon, 25 Jul 2022 09:31:45 +0800 Subject: [PATCH 17/20] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E4=B8=8A=E4=BC=A0=E4=BC=98=E5=8C=96=EF=BC=9B=E5=BD=B1?= =?UTF-8?q?=E5=83=8F=E8=B5=84=E6=BA=90=E8=AF=B7=E6=B1=82=E5=92=8COCR?= =?UTF-8?q?=E8=AF=86=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FundPaymentInvoice/LbInvoiceTemp.jsp | 26 ++- .../Comm/LBContract/LBContractPrintList.jsp | 9 +- .../LBContractPersonBaseInfo.jsp | 1 - .../MortgageFile/LbContactInfo.jsp | 4 +- src/com/ample/icms/init/IcmsRelationInit.java | 5 +- src/com/ample/icms/query/ImageInfo.java | 13 ++ src/com/ample/icms/scan/ImageOcr.java | 163 ++++++++++++++++++ src/com/ample/icms/scan/ImageUpload.java | 10 +- .../ample/icms/service/ImageInfoService.java | 100 +++++++++++ .../ample/icms/service/ImageOcrService.java | 54 ++++++ .../icms/service/ImageUploadService.java | 110 +++++++++--- .../exportcallback/impl/ZipUtils.java | 13 +- 12 files changed, 470 insertions(+), 38 deletions(-) create mode 100644 src/com/ample/icms/query/ImageInfo.java create mode 100644 src/com/ample/icms/scan/ImageOcr.java create mode 100644 src/com/ample/icms/service/ImageInfoService.java create mode 100644 src/com/ample/icms/service/ImageOcrService.java diff --git a/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp b/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp index 0da453464..17c07b2f4 100644 --- a/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp +++ b/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp @@ -45,12 +45,36 @@ String sButtons[][] = { {flag,"All","Button","保存","保存所有修改","save()","","","",""}, - {"true","All","Button","返回","返回列表","returnList()","","","",""} + {"true","All","Button","返回","返回列表","returnList()","","","",""}, + {"true","","Button","识别发票","识别发票","invoiceOrcDo()","","","",""} }; sButtonPosition = "north"; %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> +<%/*~END~*/%> + + + + +<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List07;Describe=自定义函数;]~*/%> + +<%/*~END~*/%> + + + + +<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时，进行初始化;]~*/%> + +<%/*~END~*/%> +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index ed8636251..15e42feff 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -4639,6 +4639,23 @@ + + + + + + + + + + + + + + + + + diff --git a/src/com/tenwa/channelportal/action/alpha/RentDormantExtensionPeriodAction.java b/src/com/tenwa/channelportal/action/alpha/RentDormantExtensionPeriodAction.java new file mode 100644 index 000000000..c06c57c89 --- /dev/null +++ b/src/com/tenwa/channelportal/action/alpha/RentDormantExtensionPeriodAction.java @@ -0,0 +1,116 @@ +package com.tenwa.channelportal.action.alpha; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.are.jbo.JBOTransaction; +import com.tenwa.reckon.util.UUIDUtil; +import com.tenwa.util.SerialNumberUtil; +import jbo.app.tenwa.calc.LB_RENT_DORMANT_EXTENSION_PERIOD; +import org.apache.commons.lang3.StringUtils; + +/** + * 休眠还款申请-信息保存 + */ +public class RentDormantExtensionPeriodAction { + + String flowUnid;;//流程编号 + + + public String getFlowUnid() { + return flowUnid; + } + + public void setFlowUnid(String flowUnid) { + this.flowUnid = flowUnid; + } + + /** + * 休眠还款信息保存 + * @param tx + * @throws Exception + */ + public String saveRentDormantExtensionPeriodAction(JBOTransaction tx) throws Exception{ + String res = ""; + try { + String contractDate="contractDate"; + String zcContractNum="zcContractNum"; + System.out.println("saveRentDormantAction-----------------------flowUnid="+flowUnid); + BizObjectManager lcctBm = JBOFactory.getBizObjectManager(jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP.CLASS_NAME); + BizObject lcctBo = lcctBm.createQuery("FLOWUNID=:FLOWUNID ") + .setParameter("FLOWUNID", flowUnid).getSingleResult(false); + String contractId = lcctBo.getAttribute("CONTRACT_ID").getString(); + BizObjectManager lciBm = JBOFactory.getBizObjectManager(jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO.CLASS_NAME); + BizObject lciBo = lciBm.createQuery("ID=:CONTRACT_ID ") + .setParameter("CONTRACT_ID", contractId).getSingleResult(false); + String contractNo = lciBo.getAttribute("CONTRACT_NO").getString(); + String projectId = lciBo.getAttribute("PROJECT_ID").getString(); + zcContractNum = lciBo.getAttribute("ZC_CONTRACT_NUMBER").getString(); + System.out.println("saveRentDormantAction-----------------------contractNo="+contractNo); + System.out.println("saveRentDormantAction-----------------------contractNo2="+contractNo); + System.out.println("saveRentDormantAction-----------------------zcContractNum="+zcContractNum); + String rentDormantNum = null; + String contractDate2 = null; + String zcContractNum2 = null; + String rentDormantId = null; + // TODO: 2022/2/15 休眠还款信息保存 + BizObjectManager bomLRD = JBOFactory.getFactory().getManager(LB_RENT_DORMANT_EXTENSION_PERIOD.CLASS_NAME,tx); + BizObject bolLRD = bomLRD.createQuery("FLOWUNID=:FLOWUNID ") + .setParameter("FLOWUNID", flowUnid).getSingleResult(true); + if(bolLRD != null){ + rentDormantNum = bolLRD.getAttribute("rent_dormant_num").getString(); + contractDate2 = bolLRD.getAttribute("contract_date").getString(); + zcContractNum2 = bolLRD.getAttribute("zc_contract_num").getString(); + rentDormantId = bolLRD.getAttribute("ID").getString(); + if(rentDormantNum != null){ + if(contractDate2 == null || StringUtils.isEmpty(contractDate2) || !contractDate2.equals(contractDate) + || zcContractNum2 == null || StringUtils.isEmpty(zcContractNum2) || !zcContractNum2.equals(zcContractNum)){ + bolLRD.setAttributeValue("contract_date", contractDate); + bolLRD.setAttributeValue("zc_contract_num", zcContractNum); + bomLRD.saveObject(bolLRD);//修改数据 + } + return rentDormantNum; + } + } + rentDormantNum = createContractNo(lciBo, tx); + bolLRD = bomLRD.newObject(); + bolLRD.setAttributeValue("ID", UUIDUtil.getUUID()); + bolLRD.setAttributeValue("PROJECT_ID", projectId); + bolLRD.setAttributeValue("CONTRACT_ID", contractId); + bolLRD.setAttributeValue("FLOWUNID", flowUnid); + bolLRD.setAttributeValue("rent_dormant_num", rentDormantNum); + bolLRD.setAttributeValue("contract_date", contractDate); + bolLRD.setAttributeValue("zc_contract_num", zcContractNum); + bomLRD.saveObject(bolLRD); + res = rentDormantNum; + }catch (Exception e){ + e.printStackTrace(); + } + return res; + } + + /** + * 休眠还款协议生成 + * @return + */ + private String createContractNo(BizObject lciBo, JBOTransaction tx) throws Exception{ + String area_code=lciBo.getAttribute("AREA_CODE").getString(); + String subjectid=lciBo.getAttribute("subjectid").getString(); + String dept="BQAP("; + if(area_code.equals(null)||area_code.equals("")){ + area_code="0"; + } + dept+="A"; + if(lciBo.getAttribute("LEAS_FORM").toString().equals("01")){//直租 + dept+="Z"; + }else{//回租 + dept+="H"; + } + if("d989246c11c111eaaa0000163e0e11e6".equals(subjectid)){ + dept+=")TJ"; + }else{ + dept+=")SZ"; + } + return SerialNumberUtil.getContractSerialNaumber(dept,area_code, tx); + } +} \ No newline at end of file diff --git a/src/com/tenwa/channelportal/action/alpha/RentDormantExtensionPeriodDeleteAction.java b/src/com/tenwa/channelportal/action/alpha/RentDormantExtensionPeriodDeleteAction.java new file mode 100644 index 000000000..72d1e4162 --- /dev/null +++ b/src/com/tenwa/channelportal/action/alpha/RentDormantExtensionPeriodDeleteAction.java @@ -0,0 +1,97 @@ +package com.tenwa.channelportal.action.alpha; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.are.jbo.JBOTransaction; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST; +import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT_TEMP; + +import java.util.HashMap; +import java.util.Map; + +/** + * 删除征信合同记录 + */ +public class RentDormantExtensionPeriodDeleteAction { + + String objectType;//文件类型 + String planNumber;//项目编号 + String flowUnid;;//流程编号 + + + public String getFlowUnid() { + return flowUnid; + } + + public void setFlowUnid(String flowUnid) { + this.flowUnid = flowUnid; + } + + public String getObjectType() { + return objectType; + } + + public void setObjectType(String objectType) { + this.objectType = objectType; + } + + public String getPlanNumber() { + return planNumber; + } + + public void setPlanNumber(String planNumber) { + this.planNumber = planNumber; + } + + /** + * 删除征信授权文件 + * @param tx + * @throws Exception + */ + public void deleteRentDormantExtensionPeriod(JBOTransaction tx) throws Exception{ + BizObjectManager bom = JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME); + BizObject lbDocBiz = bom.createQuery("OBJECTTYPE='contractExtensionPeriod' and plan_number=:planNumber ") + .setParameter("objectType",objectType).setParameter("planNumber",planNumber).getSingleResult(false); + if(null != lbDocBiz){ + String lbDocBizId = lbDocBiz.getAttribute("id").toString(); + BizObjectManager bom1 = JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME); + String lbDocLibraryId = bom1.createQuery("relative_id=:relative_id").setParameter("relative_id", lbDocBizId).getSingleResult(false).getAttribute("id").toString(); + BizObjectManager bom2 = JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME); + String docAttributeId = bom2.createQuery("library_id=:library_id").setParameter("library_id", lbDocLibraryId).getSingleResult(false).getAttribute("id").toString(); + BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); + // 查询lb_doc_contract_list表 +// BizObject bo = contBom.createQuery("attribute_id=:attributeId and file_flag='yes' and sendprocess='1' ") + BizObject bo = contBom.createQuery("attribute_id=:attributeId") + .setParameter("attributeId", docAttributeId).getSingleResult(false); +// if(null == bo){ + if(null != bo){ + Map condtion= new HashMap(); + condtion.put("id", lbDocBizId); + DataOperatorUtil.deleteJBOByCondtion(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME, condtion, tx); + condtion.clear(); + condtion.put("id", lbDocLibraryId); + DataOperatorUtil.deleteJBOByCondtion(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME, condtion, tx); + condtion.clear(); + condtion.put("id", docAttributeId); + DataOperatorUtil.deleteJBOByCondtion(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME, condtion, tx); + } + } + } + + /** + * 判断担保人是否为法人 + * @param tx + * @throws Exception + */ + public String checkCreditAuth(JBOTransaction tx) throws Exception{ + BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_GUARANTEE_UNIT_TEMP.CLASS_NAME, tx); + BizObject pbo = pbm.createQuery("FLOWUNID=:flowUnid") + .setParameter("flowUnid", flowUnid).getSingleResult(true); + if(null == pbo){ + return ""; + } + return pbo.getAttribute("CERTTYPE").toString(); + } +} \ No newline at end of file diff --git a/src/com/tenwa/channelportal/action/alpha/RentDormantExtensionPeriodSignAction.java b/src/com/tenwa/channelportal/action/alpha/RentDormantExtensionPeriodSignAction.java new file mode 100644 index 000000000..2621fa1d1 --- /dev/null +++ b/src/com/tenwa/channelportal/action/alpha/RentDormantExtensionPeriodSignAction.java @@ -0,0 +1,190 @@ +package com.tenwa.channelportal.action.alpha; + +import com.alibaba.fastjson.JSONObject; +import com.amarsoft.are.jbo.*; +import com.tenwa.app.dao.ContractSignInfo; +import com.tenwa.app.manage.qiyuesuo.v2.ContractSignEnums; +import com.tenwa.app.manage.qiyuesuo.v2.ContractSignVtwoUtils; +import com.tenwa.app.manage.qiyuesuo.v2.QYSParams; +import com.tenwa.channelportal.action.generativecontract.WordToPDFUtil; +import jbo.app.tenwa.doc.LB_DOCATTRIBUTE; +import jbo.app.tenwa.doc.LB_DOCLIBRARY; +import jbo.app.tenwa.doc.LB_DOCRELATIVE; +import org.apache.log4j.Logger; + +import java.io.File; + +public class RentDormantExtensionPeriodSignAction { + + private static Logger logger=Logger.getLogger(RentDormantExtensionPeriodSignAction.class); + + private String projectId; + + private String planNumber;; + + private String contractNo; + + private String contractId; + + private String subjectId; + + private String tempId; + + public String getPlanNumber() { + return planNumber; + } + + public void setPlanNumber(String planNumber) { + this.planNumber = planNumber; + } + + public String getContractNo() { + return contractNo; + } + + public void setContractNo(String contractNo) { + this.contractNo = contractNo; + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getContractId() { + return contractId; + } + + public void setContractId(String contractId) { + this.contractId = contractId; + } + + public String getSubjectId() { + return subjectId; + } + + public void setSubjectId(String subjectId) { + this.subjectId = subjectId; + } + + public String getTempId() { + return tempId; + } + + public void setTempId(String tempId) { + this.tempId = tempId; + } + + /** + * 保险委托授权书附件用LibreOffice实现word转换pdf + * word转换pdf + * @throws JBOException + */ + @SuppressWarnings({ "unchecked", "static-access" }) + public String wordToPdfRentDormantExtensionPeriod(JBOTransaction tx) throws JBOException { + BizObjectManager bom=JBOFactory.getBizObjectManager(LB_DOCRELATIVE.CLASS_NAME); + BizObject DOCRELATIVE=bom.createQuery(" OBJECTTYPE='contractExtensionPeriod' and plan_number=:planNumber ").setParameter("planNumber", planNumber).getSingleResult(false); + BizObjectManager attrBom=JBOFactory.getBizObjectManager(LB_DOCATTRIBUTE.CLASS_NAME); + BizObject attrBo=null; + WordToPDFUtil wordTopdf = new WordToPDFUtil(); + File file = null; + Boolean result = null; + String sql = ""; + try { + if (DOCRELATIVE != null) { + String DOCRELATIVEid=DOCRELATIVE.getAttribute("id").toString(); + BizObjectManager bom1=JBOFactory.getBizObjectManager(LB_DOCLIBRARY.CLASS_NAME); + String DOCLIBRARYid=bom1.createQuery("relative_id=:relative_id").setParameter("relative_id", DOCRELATIVEid).getSingleResult(false).getAttribute("id").toString(); + attrBo = attrBom.createQuery("library_id=:library_id").setParameter("library_id", DOCLIBRARYid).getSingleResult(true); + + String path = attrBo.getAttribute("FULLPATH").toString(); + String lastFilePath = path.replace(".docx", ".pdf"); + File filePath = new File(path); + if(!filePath.exists()){ + logger.info("word转换pdf的源文件不存在"); + } + String lastFilePathpdf = filePath.getParent(); + try { + result = wordTopdf.Word2Pdf(path, lastFilePathpdf); + } catch (Exception e) { + result = false; + e.printStackTrace(); + } + if (result) { + file =new File(lastFilePath); + attrBo.setAttributeValue("FULLPATH",attrBo.getAttribute("FULLPATH").toString().replace(".docx", ".pdf")); + attrBo.setAttributeValue("FILENAME",attrBo.getAttribute("FILENAME").toString().replace(".docx", ".pdf")); + attrBo.setAttributeValue("FILEPATH",attrBo.getAttribute("FILEPATH").toString().replace(".docx", ".pdf")); + attrBo.setAttributeValue("FileSize",file.length()); + attrBo.setAttributeValue("CONTENT_TYPE","application/pdf"); + attrBom.saveObject(attrBo); + } + } + } catch (JBOException e) { + e.printStackTrace(); + } + return attrBo.getAttribute("ID").toString(); + } + + + /** + * 休眠还款协议盖章:对接契约锁2.0 + * @param tx + * @return + * @throws Exception + */ + public String claimSignRentDormantTwo(JBOTransaction tx) throws Exception { + logger.info("claimSignRentDormantTwo 休眠还款协议盖章:对接契约锁2.0 开始 0126"); + String libraryid=""; + BizObjectManager bom=JBOFactory.getBizObjectManager(LB_DOCRELATIVE.CLASS_NAME); + BizObject DOCRELATIVE=bom.createQuery("OBJECTTYPE='contractExtensionPeriod' and CONTRACT_ID=:contractid ").setParameter("contractid", contractId).getSingleResult(false); + logger.info("claimSignRentDormantTwo 查询文件关联信息"); + if (DOCRELATIVE != null) { + logger.info("claimSignRentDormantTwo 查询文件关联信息不为空时"); + String DOCRELATIVEid=DOCRELATIVE.getAttribute("id").toString(); + BizObjectManager bom1=JBOFactory.getBizObjectManager(LB_DOCLIBRARY.CLASS_NAME); + libraryid=bom1.createQuery("relative_id=:relative_id").setParameter("relative_id", DOCRELATIVEid).getSingleResult(false).getAttribute("id").toString(); + logger.info("claimSignRentDormantTwo 查询文件关联信息libraryid="+libraryid); + } + BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOCATTRIBUTE.CLASS_NAME, tx); + ContractSignInfo con = null; + BizObject bo = null; + String info=""; + try{ + bo = contBom.createQuery("library_id=:libraryid").setParameter("libraryid", libraryid).getSingleResult(true); + logger.info("claimSignRentDormantTwo 查询文件信息"); + if(bo != null){ + logger.info("claimSignRentDormantTwo 查询文件信息不为空时"); + String fileName = bo.getAttribute("FILENAME").toString(); + String filePath = bo.getAttribute("FULLPATH").toString(); + logger.info("claimSignRentDormantTwo fileName="+fileName); + logger.info("claimSignRentDormantTwo filePath="+filePath); + ContractSignVtwoUtils contractSignVtwoUtils = new ContractSignVtwoUtils(); + logger.info("claimSignRentDormantTwo 发起公司盖章"); + QYSParams qysParams = new QYSParams(); + qysParams.setList(null);//手签，无需传承租人、共同申请人、担保人信息 + qysParams.setContractSignTypeEnum(ContractSignEnums.ContractSignTypeEnum.SIGNATURE_DEFAULT);//客户手签 + qysParams.setFileName(fileName); + qysParams.setFilePath(filePath); + qysParams.setSubjectId(subjectId); + qysParams.setTempId(tempId);//合同模板id + JSONObject resJson = contractSignVtwoUtils.sign(qysParams); + if (null == resJson) { + logger.warn("claimSignRentDormantTwo 20210415 调用契约锁盖章异常，返回盖章失败"); + return "error"; + } + logger.info("claimSignRentDormantTwo 20210415 调用契约锁盖章成功，res=" + resJson.toJSONString()); + return "success"; + } else { + return "error"; + } + } catch (Exception e) { + logger.error("claimSignInsuranceTwo 系统错误，错误信息: ", e); + e.printStackTrace(); + return "error"; + } + } +} \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/calc/LB_RENT_DORMANT_EXTENSION_PERIOD.java b/src_jbo/jbo/app/tenwa/calc/LB_RENT_DORMANT_EXTENSION_PERIOD.java new file mode 100644 index 000000000..8b4de3ac9 --- /dev/null +++ b/src_jbo/jbo/app/tenwa/calc/LB_RENT_DORMANT_EXTENSION_PERIOD.java @@ -0,0 +1,44 @@ +package jbo.app.tenwa.calc; + +/** +* 休眠还款协议信息表 - JBO命名常量类

+* Note: This file is generated by ADE tools, dont modify it.
+ +*/ +public interface LB_RENT_DORMANT_EXTENSION_PERIOD { + /** + * 休眠租金临时表

+ * 代表本类映射的BizObjectClass + */ + public static final String CLASS_NAME = "jbo.app.tenwa.calc.LB_RENT_DORMANT_EXTENSION_PERIOD"; + /** + * 标识 STRING(32)
+ */ + public static final String ID = "ID"; + /** + * 流程编号 STRING(32)
+ */ + public static final String FLOWUNID = "FLOWUNID"; + /** + * 项目编号 STRING(32)
+ */ + public static final String PROJECT_ID = "PROJECT_ID"; + /** + * 合同编号 STRING(32)
+ */ + public static final String CONTRACT_ID = "CONTRACT_ID"; + /** + * 中车合同编号 STRING(32)
+ */ + public static final String zc_contract_num = "zc_contract_num"; + /** + * 休眠还款协议编号 STRING(32)
+ */ + public static final String rent_dormant_num = "rent_dormant_num"; + + /** + * 合同签署时间 STRING(32)
+ */ + public static final String contract_date = "contract_date"; + +} \ No newline at end of file From 0db4302044b776fef2e1267a8fa5807740c97178 Mon Sep 17 00:00:00 2001 From: ap007 Date: Tue, 6 Sep 2022 10:40:28 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=BD=B1=E5=83=8F=E8=B5=84=E6=96=99=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FundPaymentInvoice/LbInvoiceTemp.jsp | 2 +- .../DistributorApproval/LDistributorInfo.jsp | 49 +++++++++++++++- .../DistributorChange/LDistributorInfo.jsp | 49 +++++++++++++++- .../Comm/LBContract/LBContractPrintList.jsp | 2 +- .../Flow/Comm/LBProject/LBProjectInfo.jsp | 58 +++++++++---------- .../BusinessProjectTempInfo.jsp | 3 +- .../ample/icms/service/ImageInfoService.java | 4 +- .../ample/icms/service/ImageOcrService.java | 10 +++- src/com/ample/icms/util/GetInfoUtil.java | 28 ++++++++- .../IcmsDocListCheckOfDistributor.java | 43 ++++++++++++++ 10 files changed, 203 insertions(+), 45 deletions(-) create mode 100644 src_tenwa/com/tenwa/lease/flow/project/commcheck/IcmsDocListCheckOfDistributor.java diff --git a/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp b/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp index 17c07b2f4..d5f5249eb 100644 --- a/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp +++ b/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceTemp.jsp @@ -52,7 +52,7 @@ %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> <%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp index 4cc48399d..085fe3f72 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp @@ -8,7 +8,8 @@ String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号 String RightType=CurPage.getParameter("RightType"); if(sFlowUnid == null) sFlowUnid=""; - + String sPhaseNo=CurPage.getParameter("PhaseNo");//阶段号 + String FlowNo = CurPage.getParameter("FlowNo");//流程编号 ASObjectModel temp = new ASObjectModel("LDistributorChangeInfoHis"); //获取法人原始信息 ASObjectWindow wtemp = new ASObjectWindow(CurPage, temp,request); ASResultSet rs = Sqlca.getResultSet(new SqlObject(wtemp.getDataObject().getJboSql().replaceAll("v\\.", "").replaceAll("jbo\\.[\\w+\\.]+\\.","").replaceAll(" O ", " "+temp.getJboClass().replaceAll("jbo\\.[\\w+\\.]+\\.","")+" O ")).setParameter("FlowUnid", sFlowUnid)); @@ -49,7 +50,8 @@ dwTemp.replaceColumn("beforechange", "", CurPage.getObjectWindowOutput()); String sButtons[][] = { - {"true","All","Button","保存","保存所有修改","save()","","","",""} + {"true","All","Button","保存","保存所有修改","save()","","","",""}, + {"true","","Button","资料清单","资料清单","openFileList()","","","","btn_icon_saveNew",""} /* {String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""} */ }; sButtonPosition = "north"; @@ -211,6 +213,47 @@ function saveproj_name(){ setItemRequired(0,'LIMIT_END_DATE',true); } } - +function openFileList(){ + let appInfo = getAppInfo(); + let index = appInfo.indexOf("@"); + if(index==-1){ + alert(appInfo); + return; + } + let appCode = appInfo.substr(0,index); + let appName = appInfo.substr(index+1,appInfo.length); + if(appCode=='0000'){ + alert(appName); + return; + } + openAppointFileList(appCode,appName); +} +function openAppointFileList(appCode,appName){ + let url = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestUrl",""); + let code = getCode(); + let params = getRequestParam(appCode,appName,code); + if(params!=null){ + AsControl.postICMS(url,params); + } +} +function getAppInfo(){ + let appInfo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getAppInfoByFlowNoRJM", "flowNo=<%=FlowNo%>"); + return appInfo; +} +function getCode(){ + let code = 'ECM0002'; + if( + "<%=FlowNo%>"=="DistributorApprovalFlow"&&("<%=sPhaseNo%>"=="0010")|| + "<%=FlowNo%>"=="DistributorChangeFlow"&&("<%=sPhaseNo%>"=="0010") + ){ + code = 'ECM0001'; + } + return code; +} +function getRequestParam(appCode,appName,code){ + let busiNo = getItemValue(0,0,'DISTRIBUTOR_NO'); + let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo); + return param; +} <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp index 637f664de..007e377f8 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp @@ -58,7 +58,7 @@ //因为要传到付款阶段的合同套系，所以这里的flowNo固定为FundPaymentCarFlow var sParams="ProjectId=<%=projectId%>,flowUnid=<%=flowunid%>,projectNo=<%=ProjectNo%>,flowNo=FundPaymentCarFlow"; var sReturn = RunJavaMethodTrans("com.ample.icms.service.ImageUploadService","upload",sParams); - // alert(sReturn); + alert(sReturn); } //测试电子签约 function sign(){ diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBProject/LBProjectInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBProject/LBProjectInfo.jsp index 4f62c3616..2b5239cf3 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBProject/LBProjectInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBProject/LBProjectInfo.jsp @@ -107,7 +107,8 @@ String sButtons[][] =null; sButtons= new String[][]{ {ShowButton,"All","Button","保存","保存所有修改","saveRecord()","","","",""}, - {"true","","Button","资料清单","资料清单","openFileList()","","","","btn_icon_saveNew",""} + {"true","","Button","资料清单","资料清单","openFileList()","","","","btn_icon_saveNew",""}, + {"true","","Button","尽职信审报告","尽职信审报告","openAppointFileList('APZLCTYWXSCL','传统业务信审资料')","","","","btn_icon_saveNew",""} }; %> <%/*~END~*/%> @@ -213,14 +214,7 @@ init(); } function openFileList(){ - let url = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestUrl",""); - let params = getRequestParam(); - if(params!=null){ - post(url,params); - } - } - function getRequestParam(){ - let appInfo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getAppInfoByFlowUnidRJM", "flowUnid=<%=sFlowUnid%>"); + let appInfo = getAppInfo(); let index = appInfo.indexOf("@"); if(index==-1){ alert(appInfo); @@ -228,10 +222,35 @@ init(); } let appCode = appInfo.substr(0,index); let appName = appInfo.substr(index+1,appInfo.length); + if(appCode=='0000'){ + alert(appName); + return; + } + openAppointFileList(appCode,appName); + } + function openAppointFileList(appCode,appName){ + let url = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestUrl",""); + let code = getCode(); + let params = getRequestParam(appCode,appName,code); + if(params!=null){ + AsControl.postICMS(url,params); + } + } + function getAppInfo(){ + let appInfo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getAppInfoByFlowUnidRJM", "flowUnid=<%=sFlowUnid%>"); + return appInfo; + } + function getCode(){ let code = 'ECM0002'; - if("<%=sPhaseNo%>"=="0010"){ + if( + "<%=FlowNo%>"=="ProjectApprovalFlow"&&("<%=sPhaseNo%>"=="0010"||"<%=sPhaseNo%>"=="0040"||"<%=sPhaseNo%>"=="0050")|| + "<%=FlowNo%>"=="ProjectCreditFlow"&&("<%=sPhaseNo%>"=="0010"||"<%=sPhaseNo%>"=="0040") + ){ code = 'ECM0001'; } + return code; + } + function getRequestParam(appCode,appName,code){ let busiNo = '<%=projectNo%>'; if(busiNo==null||busiNo==""||busiNo=="null"){ busiNo = RunJavaMethod("com.ample.icms.util.GetInfoUtil", "getProjectNoByFlowUnidRJM", "flowUnid=<%=sFlowUnid%>"); @@ -239,26 +258,7 @@ init(); let param = RunJavaMethod("com.ample.icms.query.ImageQuery","getRequestParam","appCode="+appCode+",appName="+appName+",code="+code+",busiNo="+busiNo); return param; } - /** - * 考虑防止一些浏览器的弹窗被阻止，不用ajax，而是用form表单提交的方式 - * @param URL - * @param PARAMS - */ - function post(URL, param) { - let temp_form = document.createElement("form"); - temp_form.action = URL; - temp_form.target = "_blank"; - temp_form.method = "post"; - temp_form.style.display = "none"; - let opt = document.createElement("textarea"); - opt.name = 'data'; - opt.value = param; - temp_form.appendChild(opt); - - document.body.appendChild(temp_form); - temp_form.submit(); - } diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp index 27dcf44e3..00d7d143b 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp @@ -61,8 +61,7 @@ dwTemp.replaceColumn("customer_info", "", CurPage.getObjectWindowOutput()); String sButtons[][] = { {"ReadOnly".equals(rightType)?"false":"true","","Button","保存","保存","save()","","","","btn_icon_saveNew",""}, - {"true","","Button","资料清单","资料清单","openFileList()","","","","btn_icon_saveNew",""}, - {"true","","Button","产品信息","产品信息","product()","","","","btn_icon_saveNew",""} + {"true","","Button","资料清单","资料清单","openFileList()","","","","btn_icon_saveNew",""} }; %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> diff --git a/src/com/ample/icms/service/ImageInfoService.java b/src/com/ample/icms/service/ImageInfoService.java index d7d8c1d5a..cd6bef407 100644 --- a/src/com/ample/icms/service/ImageInfoService.java +++ b/src/com/ample/icms/service/ImageInfoService.java @@ -16,10 +16,10 @@ public class ImageInfoService { private String projectNo; private String flowNo; - public String getFileUrl(JBOTransaction tx) throws Exception { + public String getFileUrl(String folderNo ,JBOTransaction tx) throws Exception { String result = this.getResponseResult(tx); //APZLJJ000400 APZLJJ000060 - String FileUrl = this.getFileUrlByResultAnalysis(result,"APZLJJ000060"); + String FileUrl = this.getFileUrlByResultAnalysis(result,folderNo); return FileUrl; } public String getResponseResult(JBOTransaction tx) throws SQLException, JBOException { diff --git a/src/com/ample/icms/service/ImageOcrService.java b/src/com/ample/icms/service/ImageOcrService.java index 814866327..60122b998 100644 --- a/src/com/ample/icms/service/ImageOcrService.java +++ b/src/com/ample/icms/service/ImageOcrService.java @@ -8,14 +8,18 @@ public class ImageOcrService { private String contractId; private String projectNo; private String flowNo; - public String invoiceOrcDo(JBOTransaction tx) throws Exception { + public String invoiceOrcOfInvoice(JBOTransaction tx) throws Exception { + + return this.invoiceOrc("APZLJJ000060",ImageOcr.ocrType.vehicle_invoice_ocr,tx); + } + public String invoiceOrc(String floder,ImageOcr.ocrType ocrType,JBOTransaction tx) throws Exception { ImageInfoService iis = new ImageInfoService(); iis.setContractId(contractId); iis.setFlowNo(flowNo); - String fileUrl = iis.getFileUrl(tx); + String fileUrl = iis.getFileUrl(floder,tx); ImageOcr io = new ImageOcr(); - String result = io.doPost(fileUrl, ImageOcr.ocrType.vehicle_invoice_ocr); + String result = io.doPost(fileUrl, ocrType); return result; } diff --git a/src/com/ample/icms/util/GetInfoUtil.java b/src/com/ample/icms/util/GetInfoUtil.java index f0d4b1aa2..c0957ef68 100644 --- a/src/com/ample/icms/util/GetInfoUtil.java +++ b/src/com/ample/icms/util/GetInfoUtil.java @@ -70,7 +70,7 @@ public class GetInfoUtil { String appInfo = getAppInfoByProjectNo(projectNo,flowNo,Sqlca); return appInfo; } - public String getAppInfoByProjectNo(String projectNo, String flowNo, Transaction Sqlca) throws SQLException, JBOException { + public String getAppInfoByProjectNo(String projectNo, String flowNo, Transaction Sqlca) throws SQLException { String sql = "select app_code,app_name from icms_rela where flow_no='" + flowNo + "' and project_no='" + projectNo + "'"; SqlObject sql_icms = new SqlObject(sql); ASResultSet rs = Sqlca.getASResultSet(sql_icms); @@ -310,7 +310,31 @@ public class GetInfoUtil { String productId = Sqlca.getString(new SqlObject(sql)); return productId; } - + public String getAppInfoByFlowNoRJM() throws SQLException { + Transaction Sqlca = Transaction.createTransaction("als"); + return getAppInfoByFlowNo(flowNo,Sqlca); + } + public String getAppInfoByFlowNo(String flowNo, Transaction Sqlca) throws SQLException { + String sql = "select app_code,app_name from icms_prd_rela where flowno='" + flowNo + "'"; + SqlObject sql_icms = new SqlObject(sql); + ASResultSet rs = Sqlca.getASResultSet(sql_icms); + String appCode = null; + String appName = null; + while (rs.next()) { + appCode = rs.getString("app_code"); + appName = rs.getString("app_name"); + } + if (appCode == null) { + return "0000@未找到初始化的影像信息配置，请联系管理员"; + } + String appInfo = appCode + "@" + appName; + return appInfo; + } + public String getDistributorIdByFlowUnid(String flowUnid, Transaction Sqlca) throws SQLException { + String sql = "select distributor_no from distributor_info_temp where flowunid='" + flowUnid + "'"; + String distributorNo = Sqlca.getString(new SqlObject(sql)); + return distributorNo; + } public String getFlowUnid() { return flowUnid; } diff --git a/src_tenwa/com/tenwa/lease/flow/project/commcheck/IcmsDocListCheckOfDistributor.java b/src_tenwa/com/tenwa/lease/flow/project/commcheck/IcmsDocListCheckOfDistributor.java new file mode 100644 index 000000000..2eadcb8d5 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/commcheck/IcmsDocListCheckOfDistributor.java @@ -0,0 +1,43 @@ +package com.tenwa.lease.flow.project.commcheck; + +import com.amarsoft.app.alarm.AlarmBiz; +import com.amarsoft.awe.util.Transaction; +import com.ample.icms.check.ImageCheck; +import com.ample.icms.util.GetInfoUtil; + +/** + * 资料清单检查 + * @author 20170524 + * + */ +public class IcmsDocListCheckOfDistributor extends AlarmBiz { + @Override + public Object run(Transaction Sqlca) throws Exception { + String flowUnid = this.getAttribute("ObjectNo").toString(); + GetInfoUtil gif = new GetInfoUtil(); + String busiNo = gif.getDistributorIdByFlowUnid(flowUnid,Sqlca); + String flowNo = gif.getFlowNoByFlowUnid(flowUnid,Sqlca); + String app = gif.getAppInfoByFlowNo(flowNo,Sqlca); + String [] appInfo = app.split("@"); + String appCode = appInfo[0]; + String appName = appInfo[1]; + if("0000".equals(appCode)){ + setPass(false); + putMsg(appName); + return null; + } + ImageCheck ic= new ImageCheck(); + ic.setAppCode(appCode); + ic.setAppName(appName); + ic.setBusiNo(busiNo); + String result =ic.resultAnalysis(ic.getResult()); + String[] resultInfo = result.split("@"); + if("true".equals(resultInfo[0])){ + setPass(true); + }else{ + setPass(false); + } + putMsg(resultInfo[1]); + return null; + } +} From 91933a79461118821de0637b95f93bf6e2de41a2 Mon Sep 17 00:00:00 2001 From: ap007 Date: Thu, 22 Sep 2022 09:37:54 +0800 Subject: [PATCH 20/20] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E5=89=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=EF=BC=8C=E5=B0=86?= =?UTF-8?q?admin=E6=94=B9=E4=B8=BAmarket?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/ample/icms/scan/ImageScan.java | 2 +- src/com/ample/icms/service/ImageService.java | 4 ++-- src/com/ample/icms/util/GetInfoUtil.java | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/com/ample/icms/scan/ImageScan.java b/src/com/ample/icms/scan/ImageScan.java index 52be66e03..f3e1865cc 100644 --- a/src/com/ample/icms/scan/ImageScan.java +++ b/src/com/ample/icms/scan/ImageScan.java @@ -13,7 +13,7 @@ public class ImageScan extends ImageService { base.setOrgCode("0005"); base.setComCode("0005"); base.setOrgName("安鹏国际融资租赁(深圳)有限公司"); - base.setRoleCode("admin"); + base.setRoleCode("market"); base.setOneBatch(oneBatch); } public String getOneBatch() { diff --git a/src/com/ample/icms/service/ImageService.java b/src/com/ample/icms/service/ImageService.java index 229a11267..2cc643002 100644 --- a/src/com/ample/icms/service/ImageService.java +++ b/src/com/ample/icms/service/ImageService.java @@ -41,7 +41,7 @@ public abstract class ImageService { base.setOrgCode("0005"); base.setComCode("0005"); base.setOrgName("安鹏国际融资租赁(深圳)有限公司"); - base.setRoleCode("admin"); + base.setRoleCode("market"); } public void addNode(String id ,String action ,List page){ @@ -105,7 +105,7 @@ public abstract class ImageService { postMethod.setParameter("data", getRequestParam()); // ICMS影像系统通过referer来验证白名单，所以必须将ip填写在这里 //todo - postMethod.setRequestHeader("Referer", "http://47.93.34.101"); + postMethod.setRequestHeader("Referer", PropertiesUtil.get("license_ip")); httpClient = new HttpClient(); // 执行postMethod int statusCode = httpClient.executeMethod(postMethod); diff --git a/src/com/ample/icms/util/GetInfoUtil.java b/src/com/ample/icms/util/GetInfoUtil.java index c0957ef68..8f08c402f 100644 --- a/src/com/ample/icms/util/GetInfoUtil.java +++ b/src/com/ample/icms/util/GetInfoUtil.java @@ -152,7 +152,7 @@ public class GetInfoUtil { return ja; } public JSONArray getAllAppInfoJsonByProductId(String productId, Transaction Sqlca) throws SQLException { - String sql = "select app_code,app_name from icms_prd_rela where productid='" + productId + "' and flowno<>'MortgageFileMailFlow' group by app_code"; + String sql = "select app_code,app_name from icms_prd_rela where productid='" + productId + "' and flowno<>'MortgageFileMailFlow' group by app_code order by update_time desc"; SqlObject sql_icms = new SqlObject(sql); ASResultSet rs = Sqlca.getASResultSet(sql_icms); String appCode = null; @@ -189,7 +189,7 @@ public class GetInfoUtil { } public String getAppInfoByProductId(String productId, String flowNo, Transaction Sqlca) throws SQLException { - String sql = "select app_code,app_name from icms_prd_rela where flowno='" + flowNo + "' and productid='" + productId + "'"; + String sql = "select app_code,app_name from icms_prd_rela where flowno='" + flowNo + "' and productid='" + productId + "' order by update_time desc"; SqlObject sql_icms = new SqlObject(sql); ASResultSet rs = Sqlca.getASResultSet(sql_icms); String appCode = null; @@ -315,7 +315,7 @@ public class GetInfoUtil { return getAppInfoByFlowNo(flowNo,Sqlca); } public String getAppInfoByFlowNo(String flowNo, Transaction Sqlca) throws SQLException { - String sql = "select app_code,app_name from icms_prd_rela where flowno='" + flowNo + "'"; + String sql = "select app_code,app_name from icms_prd_rela where flowno='" + flowNo + "' order by update_time desc"; SqlObject sql_icms = new SqlObject(sql); ASResultSet rs = Sqlca.getASResultSet(sql_icms); String appCode = null;