From abf3976582790244f04168da7a84518dc728a28d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A3=8A?= <寮犵@LAPTOP-O3DO03BA> Date: Fri, 15 Jun 2018 09:32:31 +0800 Subject: [PATCH 01/21] =?UTF-8?q?=E9=93=B6=E8=A1=8C=E5=8D=A1=E5=9B=9B?= =?UTF-8?q?=E8=A6=81=E7=B4=A0=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Flow/CollectionAudit/LcCustomerBankVertifyList.jsp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcCustomerBankVertifyList.jsp b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcCustomerBankVertifyList.jsp index 82dbf9f46..29dfac813 100644 --- a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcCustomerBankVertifyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcCustomerBankVertifyList.jsp @@ -17,8 +17,8 @@ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 String sButtons[][] = { - {"true","All","Button","验证银行卡信息","验证银行卡信息","verifyBankInfo()","","","","btn_icon_add",""}, - {"true","All","Button","编辑","编辑","viewAndEdit()","","","","btn_icon_add",""}, + {"true","All","Button","验证银行卡信息","验证银行卡信息","verifyBankInfo()","","","","btn_icon_add",""} + //{"true","All","Button","编辑","编辑","viewAndEdit()","","","","btn_icon_add",""}, }; %><%@include file="/Frame/resources/include/ui/include_list.jspf"%> <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file From 1c395fff7e74b9ca102b42140e176991330aa0ac Mon Sep 17 00:00:00 2001 From: amarsoft Date: Fri, 15 Jun 2018 10:17:02 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BA=A7=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LmDistributorToproductList.jsp | 67 +++++++++++++++++++ .../LmProductDistributorCar.jsp | 20 ++++++ .../LmProductDistributorList.jsp | 40 +++++++++++ .../apzl/saveunioncar/saveUnionCarUtil.java | 56 ++++++++++++++++ 4 files changed, 183 insertions(+) create mode 100644 WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp create mode 100644 WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorCar.jsp create mode 100644 WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorList.jsp diff --git a/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp b/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp new file mode 100644 index 000000000..673b40444 --- /dev/null +++ b/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp @@ -0,0 +1,67 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2018-06-06 + Content: + History Log: + */ + ASObjectModel doTemp = new ASObjectModel("LM_DISTRIBUTOR_TO_PRODUCT"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + String distributorId = CurPage.getParameter("DISTRIBUTOR_ID"); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(distributorId); + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] = { + {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + {"false","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, + {"true","","Button","删除","删除","asDelete()","","","","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/Apzl/PortalToCarType/LmProductDistributorCar.jsp b/WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorCar.jsp new file mode 100644 index 000000000..7c8c55f43 --- /dev/null +++ b/WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorCar.jsp @@ -0,0 +1,20 @@ +<%@ page contentType="text/html; charset=GBK"%><%@ + include file="/IncludeBegin.jsp"%><% +/* + 页面说明: 示例上下联动框架页面 + */ + String distributorId = CurPage.getParameter("distributorId"); +%><%@include file="/Resources/CodeParts/Frame02.jsp"%> + +<%@ include file="/IncludeEnd.jsp"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorList.jsp b/WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorList.jsp new file mode 100644 index 000000000..30d045714 --- /dev/null +++ b/WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorList.jsp @@ -0,0 +1,40 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2018-06-06 + Content: + History Log: + */ + ASObjectModel doTemp = new ASObjectModel("LM_DISTRIBUTOR_LIST"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(""); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] = { + {"false","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + {"false","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, + {"false","","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/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java b/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java index d070b2e37..a6adad886 100644 --- a/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java +++ b/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.UUID; import jbo.app.tenwa.customer.LM_DISTRIBUTOR_TO_CAR; +import jbo.app.tenwa.customer.LM_DISTRIBUTOR_TO_PRODUCT; import jbo.app.tenwa.customer.LM_PORTAL_TO_CAR; import jbo.com.tenwa.limit.LA_LIMIT_ELEMENT; @@ -117,6 +118,56 @@ public String getCarBrandId() { } return "error"; } + + + public String saveLmDistributorToProduct(JBOTransaction tx)throws Exception { + /* + CarBrandId=admin@~ + 8009002@~ + 2018/06/12 15:03:50@~ + 7c7624a558594bff8387ca6949982b21@~ + 00303ba448074b0792bd465dd2359b7c@ + */ + String[] params = CarBrandId.split("@~"); + String updateUserID = params[0]; + String updateOrgId = params[1]; + String updateTime = params[2]; + String distributorId = params[3]; + String productid=params[4]; + int lle=0; + BizObjectManager Lmcheck = JBOFactory.getBizObjectManager(LM_DISTRIBUTOR_TO_PRODUCT.CLASS_NAME,tx); + BizObject obcheck=Lmcheck.createQuery("DISTRIBUTOR_ID=:DISTRIBUTOR_ID and PRODUCT_ID=:PRODUCT_ID") + .setParameter("DISTRIBUTOR_ID", distributorId).setParameter("PRODUCT_ID",productid).getSingleResult(false); + if(Lmcheck!=null){ + return "error"; + } + int i; + try{ + for(i=4;i=0){ + return "success"; + } + return "error"; + } /** * 删除经销商车型关联表的关联 * @param tx @@ -128,6 +179,11 @@ public String getCarBrandId() { Lmpc.createQuery("delete from o where id = :id").setParameter("id",unionId).executeUpdate(); return "success"; } + public String deleteLmDistributorToProduct(JBOTransaction tx)throws Exception { + BizObjectManager Lmpc = JBOFactory.getBizObjectManager(LM_DISTRIBUTOR_TO_PRODUCT.CLASS_NAME,tx); + Lmpc.createQuery("delete from o where id = :id").setParameter("id",unionId).executeUpdate(); + return "success"; + } /** * 删除渠道机构车型关联表的关联 * @param tx From b349628ccabc2ba825fcc49c291c75e854569bdd Mon Sep 17 00:00:00 2001 From: liuz Date: Fri, 15 Jun 2018 10:25:18 +0800 Subject: [PATCH 04/21] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_customer.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml index 6e3f3c9fd..e7522548b 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml @@ -2324,5 +2324,25 @@ + + + + + + + + + + + + + + + + + + + + From 741f9365cae625a273dfe5f41a821a442134247b Mon Sep 17 00:00:00 2001 From: liuz Date: Fri, 15 Jun 2018 10:34:44 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 2c7182932..7200b3005 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -1497,6 +1497,11 @@ + + + + + From b940da25a727609957874fe2b1c52613537b62a7 Mon Sep 17 00:00:00 2001 From: liujiaji Date: Fri, 15 Jun 2018 10:43:07 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=93=E5=AD=98...?= =?UTF-8?q?=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/cache.xml | 45 +++-- .../als/base/awe/util/AweDoCommUtil.java | 114 ++++++------ .../base/cache/instance/AppPrdCataCache.java | 96 ++++++++++ .../cache/instance/AppPrdLibraryCache.java | 137 ++++++++++++++ .../cache/instance/AppPrdMiddleCache.java | 125 +++++++++++++ .../base/cache/instance/AppTemplateCache.java | 86 +++++++++ .../base/cache/loader/AppPrdCataLoader.java | 12 ++ .../cache/loader/AppPrdLibraryLoader.java | 12 ++ .../base/cache/loader/AppPrdMiddleLoader.java | 12 ++ .../base/cache/loader/AppTemplateLoader.java | 12 ++ .../amarsoft/als/base/flow/AppConfigFlow.java | 169 ++++++++++++++---- 11 files changed, 706 insertions(+), 114 deletions(-) create mode 100644 src_app_fresh/apx/com/amarsoft/als/base/cache/instance/AppPrdCataCache.java create mode 100644 src_app_fresh/apx/com/amarsoft/als/base/cache/instance/AppPrdLibraryCache.java create mode 100644 src_app_fresh/apx/com/amarsoft/als/base/cache/instance/AppPrdMiddleCache.java create mode 100644 src_app_fresh/apx/com/amarsoft/als/base/cache/instance/AppTemplateCache.java create mode 100644 src_app_fresh/apx/com/amarsoft/als/base/cache/loader/AppPrdCataLoader.java create mode 100644 src_app_fresh/apx/com/amarsoft/als/base/cache/loader/AppPrdLibraryLoader.java create mode 100644 src_app_fresh/apx/com/amarsoft/als/base/cache/loader/AppPrdMiddleLoader.java create mode 100644 src_app_fresh/apx/com/amarsoft/als/base/cache/loader/AppTemplateLoader.java diff --git a/WebContent/WEB-INF/etc/cache.xml b/WebContent/WEB-INF/etc/cache.xml index 9bf3177b2..10899c9d2 100644 --- a/WebContent/WEB-INF/etc/cache.xml +++ b/WebContent/WEB-INF/etc/cache.xml @@ -1,20 +1,5 @@ - - - - - - - - - @@ -30,14 +15,36 @@ loadClass="com.amarsoft.dict.als.cache.loader.AWEDataWindowLoader" size="50" expireTime="1200" /> - + + + + + - + + + + + + \ No newline at end of file diff --git a/src_app_fresh/apx/com/amarsoft/als/base/awe/util/AweDoCommUtil.java b/src_app_fresh/apx/com/amarsoft/als/base/awe/util/AweDoCommUtil.java index 142b40136..78e5c57ab 100644 --- a/src_app_fresh/apx/com/amarsoft/als/base/awe/util/AweDoCommUtil.java +++ b/src_app_fresh/apx/com/amarsoft/als/base/awe/util/AweDoCommUtil.java @@ -4,15 +4,15 @@ import java.util.HashMap; import java.util.Map; public class AweDoCommUtil { - public static void main(String[] args) throws Exception { +public static void main(String[] args) throws Exception { - String str = "id=:id1 and (ida>=:id2 or idb<=:id3) and idc >: id4 (idd <: id5 and ide <>:id6)"; + String str = "flowunid=:id1 and (ida>=:id2 or idb<=:id3) and idc >: id4 (idd <: id5 and ide <>:id6)"; System.out.println(str); Map map = new HashMap(); - map.put("id", "1"); + map.put("flowunid", "1"); map.put("ida", "2"); map.put("idb", "3"); map.put("idc", "4"); @@ -109,23 +109,24 @@ public class AweDoCommUtil { where = where.replace(" AND ", " and "); where = where.replace(" OR ", " or "); String[] array = where.split("and"); - String[] array1 = null; - String sKey = ""; - String newStr = ""; for (String str : array) { if (str.contains(":")) { - array1 = str.split(":"); String[] orArray = str.split("or"); if (orArray.length >= 2) { + // [ (O.INPUTORGID=:inputOrgId , O.INPUTORGID like :inputOrgId1)] for (String orStr : orArray) { -// if (array1.length != 2) -// continue; + // O.contract_id = :contract_id + String[] array1 = orStr.split(":"); + // O.contract_id = > 0 + // contract_id> 1 + if (array1.length != 2) + continue; if (!array1[0].contains(".")) { - sKey = array1[0].toLowerCase(); + String sKey = array1[0].toLowerCase(); sKey = sKey.trim(); sKey = sKey.substring(0, sKey.length() - 1); sKey = sKey.trim(); - newStr = array1[0] + "'" + String newStr = array1[0] + "'" + paramMap.get(sKey) + "' "; sJboWhere = sJboWhere.replace(orStr, newStr); continue; @@ -133,42 +134,47 @@ public class AweDoCommUtil { String[] array2 = array1[0].split("\\."); if (array2.length < 2) continue; - sKey = array2[array2.length - 1].toLowerCase().trim(); - + String sKey = array2[1].toLowerCase(); + // inputorgid like if (sKey.contains("like") || sKey.contains("LIKE")) { - newStr = array1[0] + "'" + paramMap.get(sKey.trim().replaceAll("like", "").trim()) + "' ".trim(); - } else if (sKey.contains(" in ") || sKey.contains(" IN ")) { - newStr = array1[0] + "'" + paramMap.get(sKey.trim().replaceAll(" in ", "").trim()) + "' ".trim(); + String newStr = array1[0] + "'" + paramMap.get(sKey.trim().replaceAll("like", "").trim()) + "' "; + String sStr = array1[1]; + while (sStr.endsWith(")")) { + newStr += ")"; + sStr = sStr.substring(0, sStr.length() - 1); + } + sJboWhere = sJboWhere.replace(orStr, newStr); } else { - sKey = sKey.substring(0, sKey.length() - 1).trim(); - newStr = array1[0] + "'" - + paramMap.get(sKey) + "' ".trim(); - + sKey = sKey.trim(); + sKey = sKey.substring(0, sKey.length() - 1); + sKey = sKey.trim(); + String newStr = array1[0] + "'" + + paramMap.get(sKey) + "' "; + String sStr = array1[1]; + while (sStr.endsWith(")")) { + newStr += ")"; + sStr = sStr.substring(0, sStr.length() - 1); + } + sJboWhere = sJboWhere.replace(orStr, newStr); } - String sStr = orStr.trim(); - while (sStr.endsWith(")")) { -// newStr += ")"; - sStr = sStr.substring(0, sStr.length()-1); - } - sJboWhere = sJboWhere.replace(sStr, newStr); sJboWhere += " "; } - } else { // 没有 or + sJboWhere = sJboWhere.substring(0, sJboWhere.length() - 1); + } else { + // O.contract_id = :contract_id + String[] array1 = str.split(":"); + // O.contract_id = > 0 + // contract_id> 1 if (array1.length != 2) continue; - if (!array1[0].contains(".")) { // 没有 O. xx. - sKey = array1[0].toLowerCase().trim(); - newStr = ""; - if (sKey.contains(" like ") || sKey.contains(" LIKE ")) { // flowUnid like : flowUnid - newStr = array1[0] + "'" + paramMap.get(sKey.replaceAll(" like ", "").trim()) + "'".trim(); - } else if (sKey.contains(" in ") || sKey.contains(" IN ")) { // flowUnid in : flowUnid - newStr = array1[0] + "'" + paramMap.get(sKey.replaceAll(" in ", "").trim()) + "'".trim(); - } else { // flowUnid = || > || < : flowUnid - sKey = sKey.substring(0, sKey.length() - 1).trim(); - newStr = array1[0] + "'" + paramMap.get(sKey) + "' ".trim(); - } - - String sStr = array1[1].trim(); + if (!array1[0].contains(".")) { + String sKey = array1[0].toLowerCase(); + sKey = sKey.trim(); + sKey = sKey.substring(0, sKey.length() - 1); + sKey = sKey.trim(); + String newStr = array1[0] + "'" + + paramMap.get(sKey) + "' "; + String sStr = array1[1]; while (sStr.endsWith(")")) { newStr += ")"; sStr = sStr.substring(0, sStr.length() - 1); @@ -179,25 +185,19 @@ public class AweDoCommUtil { String[] array2 = array1[0].split("\\."); if (array2.length < 2) continue; - sKey = array2[array2.length - 1].toLowerCase().trim(); - newStr = ""; - if (sKey.contains(" like ") || sKey.contains(" LIKE ")) { // flowUnid like : flowUnid - newStr = array1[0] + "'" + paramMap.get(sKey.replaceAll(" like ", "").trim()) + "'".trim(); - } else if (sKey.contains(" in ") || sKey.contains(" IN ")) { // flowUnid in : flowUnid - newStr = array1[0] + "'" + paramMap.get(sKey.replaceAll(" in ", "").trim()) + "'".trim(); - } else { // flowUnid = || > || < : flowUnid - sKey = sKey.substring(0, sKey.length() - 1).trim(); - newStr = array1[0] + "'" + paramMap.get(sKey) + "' ".trim(); + String sKey = array2[1].toLowerCase(); + sKey = sKey.trim(); + sKey = sKey.substring(0, sKey.length() - 1); + sKey = sKey.trim(); + String newStr = array1[0] + "'" + + paramMap.get(sKey.toLowerCase()) + "' "; + String sStr = array1[1]; + while (sStr.endsWith(")")) { + newStr += ")"; + sStr = sStr.substring(0, sStr.length() - 1); } + sJboWhere = sJboWhere.replace(str, newStr); } - newStr = newStr.trim(); - String sStr = array1[1].trim(); - while (sStr.endsWith(")")) { - newStr += ")"; - sStr = sStr.substring(0, sStr.length() - 1); - } - newStr = " " + newStr + " "; - sJboWhere = sJboWhere.replace(str, newStr); } } return sJboWhere; diff --git a/src_app_fresh/apx/com/amarsoft/als/base/cache/instance/AppPrdCataCache.java b/src_app_fresh/apx/com/amarsoft/als/base/cache/instance/AppPrdCataCache.java new file mode 100644 index 000000000..0c7ad5d15 --- /dev/null +++ b/src_app_fresh/apx/com/amarsoft/als/base/cache/instance/AppPrdCataCache.java @@ -0,0 +1,96 @@ +package apx.com.amarsoft.als.base.cache.instance; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jbo.app.PRD_NODEINFO_CATALOG_APP; + +import com.amarsoft.are.ARE; +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.BizObjectQuery; +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.dict.als.cache.AbstractCache; + +public class AppPrdCataCache extends AbstractCache { + private static Map appPrdCataPool = null; + private static AppPrdCataCache instance = null; + + public static synchronized AppPrdCataCache getInstance() { + if (instance == null) { + instance = new AppPrdCataCache(); + } + return instance; + } + + public static Map getAppPrdCataPool() { + return appPrdCataPool; + } + + public synchronized Map getCacheMapPool() { + if (appPrdCataPool == null) + appPrdCataPool = new HashMap(); + return appPrdCataPool; + } + + @Override + public synchronized void clear() throws Exception { + getCacheMapPool().clear(); + appPrdCataPool = null; + } + + @Override + public synchronized boolean load(Transaction arg0) throws Exception { + ARE.getLog().info( + "[CACHE] AppPrdCataCache bulid Begin ................."); + initPrdCachePool(); + ARE.getLog().info( + "[CACHE] AppPrdCataCache bulid End ..................."); + return true; + } + + @SuppressWarnings("unchecked") + private synchronized void initPrdCachePool() throws JBOException { + appPrdCataPool = new HashMap(); + + String sSql = "SELECT * FROM O ORDER BY FLOWNO, SORTNO ASC"; + BizObjectManager bom = JBOFactory + .getBizObjectManager(PRD_NODEINFO_CATALOG_APP.CLASS_NAME); + BizObjectQuery boq = bom.createQuery(sSql); + List bos = boq.getResultList(false); + List> colList = new ArrayList>(); + int i = 100; + for (BizObject bo : bos) { + i ++; + Map colMap = new HashMap(); + String id = bo.getAttribute("ID") == null ? "" : bo.getAttribute( + "ID").toString(); + String flowNo = bo.getAttribute("FLOWNO") == null ? "" : bo + .getAttribute("FLOWNO").toString(); + String phaseNo = bo.getAttribute("PHASENO") == null ? "" : bo + .getAttribute("PHASENO").toString(); + String configType = bo.getAttribute("CONFIG_TYPE") == null ? "" + : bo.getAttribute("CONFIG_TYPE").toString(); + String configDisplay = bo.getAttribute("CONFIG_DISPLAY") == null ? "" + : bo.getAttribute("CONFIG_DISPLAY").toString(); + String enableOperation = bo.getAttribute("ENABLE_OPERATION") == null ? "" + : bo.getAttribute("ENABLE_OPERATION").toString(); + String sortNo = bo.getAttribute("SORTNO") == null ? "" : bo + .getAttribute("SORTNO").toString(); + + colMap.put("id".toLowerCase(), id); + colMap.put("flowNo".toLowerCase(), flowNo); + colMap.put("phaseNo".toLowerCase(), phaseNo); + colMap.put("configType".toLowerCase(), configType); + colMap.put("configDisplay".toLowerCase(), configDisplay); + colMap.put("enableOperation".toLowerCase(), enableOperation); + colMap.put("sortNo".toLowerCase(), sortNo); + colList.add(colMap); + appPrdCataPool.put(flowNo + i, colList); + } + } +} diff --git a/src_app_fresh/apx/com/amarsoft/als/base/cache/instance/AppPrdLibraryCache.java b/src_app_fresh/apx/com/amarsoft/als/base/cache/instance/AppPrdLibraryCache.java new file mode 100644 index 000000000..721292e5f --- /dev/null +++ b/src_app_fresh/apx/com/amarsoft/als/base/cache/instance/AppPrdLibraryCache.java @@ -0,0 +1,137 @@ +package apx.com.amarsoft.als.base.cache.instance; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jbo.app.PRD_NODEINFO_LIBRARY_APP; + +import com.amarsoft.are.ARE; +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.BizObjectQuery; +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.dict.als.cache.AbstractCache; + +public class AppPrdLibraryCache extends AbstractCache { + private static Map appPrdLibraryPool = null; + private static AppPrdLibraryCache instance = null; + + public static synchronized AppPrdLibraryCache getInstance() { + if (instance == null) { + instance = new AppPrdLibraryCache(); + } + return instance; + } + + public static Map getAppPrdLibraryCachePool() { + return appPrdLibraryPool; + } + + public synchronized Map getCacheMapPool() { + if (appPrdLibraryPool == null) + appPrdLibraryPool = new HashMap(); + return appPrdLibraryPool; + } + + @Override + public synchronized void clear() throws Exception { + getCacheMapPool().clear(); + appPrdLibraryPool = null; + } + + @Override + public synchronized boolean load(Transaction arg0) throws Exception { + ARE.getLog().info( + "[CACHE] AppPrdLibraryCache bulid Begin ................."); + initPrdLibraryPool(); + ARE.getLog().info( + "[CACHE] AppPrdLibraryCache bulid End ..................."); + return true; + } + + @SuppressWarnings("unchecked") + private synchronized void initPrdLibraryPool() throws JBOException { + appPrdLibraryPool = new HashMap(); + + String sSql = "SELECT ID,APP_BUSINESS_GROUP_CODE,INITIAL_CONDITION,AUXILIARY_CONDITION,"; + sSql += "INTERFACE_DESC,ATTRIBUTE1,ATTRIBUTE2,ATTRIBUTE3,ATTRIBUTE4,ATTRIBUTE5,ATTRIBUTE6,ATTRIBUTE7,ATTRIBUTE8,ATTRIBUTE9,"; + sSql += "REBUILD_JBO_CLASS,FATHER_ID,DISPLAY_MANAGE_CLASS,SAVE_MANAGE_CLASS,DELETE_MANAGE_CLASS "; + sSql += "FROM O ORDER BY ID ASC"; + BizObjectManager bom = JBOFactory + .getBizObjectManager(PRD_NODEINFO_LIBRARY_APP.CLASS_NAME); + BizObjectQuery boq = bom.createQuery(sSql); + List bos = boq.getResultList(false); + for (BizObject bo : bos) { + List> colList = new ArrayList>(); + Map colMap = new HashMap(); + + String id = bo.getAttribute("id") == null ? "" : bo.getAttribute( + "id").toString(); + String appBusinessGroupCode = bo + .getAttribute("app_business_group_code") == null ? "" : bo + .getAttribute("app_business_group_code").toString(); + String initialCondition = bo.getAttribute("initial_condition") == null ? "" + : bo.getAttribute("initial_condition").toString(); + String auxiliaryCondition = bo.getAttribute("auxiliary_condition") == null ? "" + : bo.getAttribute("auxiliary_condition").toString(); + String interfaceDesc = bo.getAttribute("interface_desc") == null ? "" + : bo.getAttribute("interface_desc").toString(); + String attribute1 = bo.getAttribute("attribute1") == null ? "" : bo + .getAttribute("attribute1").toString(); + String attribute2 = bo.getAttribute("attribute2") == null ? "" : bo + .getAttribute("attribute2").toString(); + String attribute3 = bo.getAttribute("attribute3") == null ? "" : bo + .getAttribute("attribute3").toString(); + String attribute4 = bo.getAttribute("attribute4") == null ? "" : bo + .getAttribute("attribute4").toString(); + String attribute5 = bo.getAttribute("attribute5") == null ? "" : bo + .getAttribute("attribute5").toString(); + String attribute6 = bo.getAttribute("attribute6") == null ? "" : bo + .getAttribute("attribute6").toString(); + String attribute7 = bo.getAttribute("attribute7") == null ? "" : bo + .getAttribute("attribute7").toString(); + String attribute8 = bo.getAttribute("attribute8") == null ? "" : bo + .getAttribute("attribute8").toString(); + String attribute9 = bo.getAttribute("attribute9") == null ? "" : bo + .getAttribute("attribute9").toString(); + String rebuildJboClass = bo.getAttribute("rebuild_jbo_class") == null ? "" + : bo.getAttribute("rebuild_jbo_class").toString(); + String fatherId = bo.getAttribute("father_id") == null ? "" : bo + .getAttribute("father_id").toString(); + String displayManage_class = bo + .getAttribute("display_manage_class") == null ? "" : bo + .getAttribute("display_manage_class").toString(); + String saveManageClass = bo.getAttribute("save_manage_class") == null ? "" + : bo.getAttribute("save_manage_class").toString(); + String deleteManageClass = bo.getAttribute("delete_manage_class") == null ? "" + : bo.getAttribute("delete_manage_class").toString(); + + colMap.put("id".toLowerCase(), id); + colMap.put("appBusinessGroupCode".toLowerCase(), appBusinessGroupCode); + colMap.put("initialCondition".toLowerCase(), initialCondition); + colMap.put("auxiliaryCondition".toLowerCase(), auxiliaryCondition); + colMap.put("interfaceDesc".toLowerCase(), interfaceDesc); + colMap.put("attribute1".toLowerCase(), attribute1); + colMap.put("attribute2".toLowerCase(), attribute2); + colMap.put("attribute3".toLowerCase(), attribute3); + colMap.put("attribute4".toLowerCase(), attribute4); + colMap.put("attribute5".toLowerCase(), attribute5); + colMap.put("attribute6".toLowerCase(), attribute6); + colMap.put("attribute7".toLowerCase(), attribute7); + colMap.put("attribute8".toLowerCase(), attribute8); + colMap.put("attribute9".toLowerCase(), attribute9); + colMap.put("rebuildJboClass".toLowerCase(), rebuildJboClass); + colMap.put("fatherId".toLowerCase(), fatherId); + colMap.put("displayManage_class".toLowerCase(), displayManage_class); + colMap.put("saveManageClass".toLowerCase(), saveManageClass); + colMap.put("deleteManageClass".toLowerCase(), deleteManageClass); + + colList.add(colMap); + appPrdLibraryPool.put(id, colList); + } + } +} \ No newline at end of file diff --git a/src_app_fresh/apx/com/amarsoft/als/base/cache/instance/AppPrdMiddleCache.java b/src_app_fresh/apx/com/amarsoft/als/base/cache/instance/AppPrdMiddleCache.java new file mode 100644 index 000000000..528bd2cee --- /dev/null +++ b/src_app_fresh/apx/com/amarsoft/als/base/cache/instance/AppPrdMiddleCache.java @@ -0,0 +1,125 @@ +package apx.com.amarsoft.als.base.cache.instance; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jbo.app.PRD_NODEINFO_MIDDLE_APP; + +import com.amarsoft.are.ARE; +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.BizObjectQuery; +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.dict.als.cache.AbstractCache; + +public class AppPrdMiddleCache extends AbstractCache { + private static Map appPrdMiddlePool = null; + private static AppPrdMiddleCache instance = null; + + public static synchronized AppPrdMiddleCache getInstance() { + if (instance == null) { + instance = new AppPrdMiddleCache(); + } + return instance; + } + + public static Map getAppPrdMiddleCachePool() { + return appPrdMiddlePool; + } + + public synchronized Map getCacheMapPool() { + if (appPrdMiddlePool == null) + appPrdMiddlePool = new HashMap(); + return appPrdMiddlePool; + } + + @Override + public synchronized void clear() throws Exception { + getCacheMapPool().clear(); + appPrdMiddlePool = null; + } + + @Override + public synchronized boolean load(Transaction arg0) throws Exception { + ARE.getLog().info( + "[CACHE] AppPrdMiddleCache bulid Begin ................."); + initPrdMiddlePool(); + ARE.getLog().info( + "[CACHE] AppPrdMiddleCache bulid End ..................."); + return true; + } + + @SuppressWarnings("unchecked") + private synchronized void initPrdMiddlePool() throws JBOException { + appPrdMiddlePool = new HashMap(); + + String sSql = "SELECT APP_NODE_LIBRARY_ID,APP_NODE_CATALOG_ID,"; + sSql += "APP_DISPLAY,ENABLE_QUERY,ENABLE_SAVE,ENABLE_DELETE,SORTNO,"; + sSql += "ISINUSE,ENABLE_DOWNLOAD,DOWNLOAD_PARAM FROM O "; + sSql += "WHERE ISINUSE='1' ORDER BY APP_NODE_CATALOG_ID, SORTNO"; + + BizObjectManager bom = JBOFactory + .getBizObjectManager(PRD_NODEINFO_MIDDLE_APP.CLASS_NAME); + BizObjectQuery boq = bom.createQuery(sSql); + List bos = boq.getResultList(false); + String lastId = ""; + List> list = new ArrayList>(); + for (BizObject bo : bos) { + Map map = new HashMap(); + List> colList = new ArrayList>(); + + Map colMap = new HashMap(); + String appNodeLibraryId = bo.getAttribute("APP_NODE_LIBRARY_ID") == null ? "" : bo + .getAttribute("APP_NODE_LIBRARY_ID").toString(); + String appNodeCatalogId = bo.getAttribute("APP_NODE_CATALOG_ID") == null ? "" : bo + .getAttribute("APP_NODE_CATALOG_ID").toString(); + System.out.println("appNodeCatalogId:"+appNodeCatalogId); + String appDisplay = bo.getAttribute("APP_DISPLAY") == null ? "" : bo + .getAttribute("APP_DISPLAY").toString(); + String enableQuery = bo.getAttribute("ENABLE_QUERY") == null ? "" : bo + .getAttribute("ENABLE_QUERY").toString(); + String enableSave = bo.getAttribute("ENABLE_SAVE") == null ? "" : bo + .getAttribute("ENABLE_SAVE").toString(); + String enableDelete = bo.getAttribute("ENABLE_DELETE") == null ? "" : bo + .getAttribute("ENABLE_DELETE").toString(); + String sortNo = bo.getAttribute("SORTNO") == null ? "" : bo + .getAttribute("SORTNO").toString(); + String isinuse = bo.getAttribute("ISINUSE") == null ? "" : bo + .getAttribute("ISINUSE").toString(); + String enableDownload = bo.getAttribute("ENABLE_DOWNLOAD") == null ? "" : bo + .getAttribute("ENABLE_DOWNLOAD").toString(); + String downloadParam = bo.getAttribute("DOWNLOAD_PARAM") == null ? "" : bo + .getAttribute("DOWNLOAD_PARAM").toString(); + + colMap.put("appNodeLibraryId".toLowerCase(), appNodeLibraryId); + colMap.put("appNodeCatalogId".toLowerCase(), appNodeCatalogId); + colMap.put("appDisplay".toLowerCase(), appDisplay); + colMap.put("enableQuery".toLowerCase(), enableQuery); + colMap.put("enableSave".toLowerCase(), enableSave); + colMap.put("enableDelete".toLowerCase(), enableDelete); + colMap.put("sortNo".toLowerCase(), sortNo); + colMap.put("isinuse".toLowerCase(), isinuse); + colMap.put("enableDownload".toLowerCase(), enableDownload); + colMap.put("downloadParam".toLowerCase(), downloadParam); + + colList.add(colMap); + if (lastId.equals(appNodeCatalogId)) { + map = new HashMap(); + lastId = appNodeCatalogId; + } else { + list = new ArrayList>(); + map = new HashMap(); + lastId = appNodeCatalogId; + } + map.put("info", colList); + list.add(map); + appPrdMiddlePool.put(lastId, list); + System.out.println(lastId + ": " + appPrdMiddlePool.get(lastId)); + lastId = appNodeCatalogId; + } + } +} \ No newline at end of file diff --git a/src_app_fresh/apx/com/amarsoft/als/base/cache/instance/AppTemplateCache.java b/src_app_fresh/apx/com/amarsoft/als/base/cache/instance/AppTemplateCache.java new file mode 100644 index 000000000..e9ca1e17e --- /dev/null +++ b/src_app_fresh/apx/com/amarsoft/als/base/cache/instance/AppTemplateCache.java @@ -0,0 +1,86 @@ +package apx.com.amarsoft.als.base.cache.instance; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jbo.app.APP_BUSINESS_GROUP; +import jbo.app.APP_BUSINESS_TEMPLATE; + +import com.amarsoft.are.ARE; +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.BizObjectQuery; +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.dict.als.cache.AbstractCache; + +public class AppTemplateCache extends AbstractCache { + private static Map AppTemplatePool = null; + private static AppTemplateCache instance = null; + + public static synchronized AppTemplateCache getInstance() { + if (instance == null) { + instance = new AppTemplateCache(); + } + return instance; + } + + public static Map getAppTemplateCachePool() { + return AppTemplatePool; + } + + public synchronized Map getCacheMapPool() { + if (AppTemplatePool == null) + AppTemplatePool = new HashMap(); + return AppTemplatePool; + } + + @Override + public synchronized void clear() throws Exception { + getCacheMapPool().clear(); + AppTemplatePool = null; + } + + @Override + public synchronized boolean load(Transaction arg0) throws Exception { + ARE.getLog().info( + "[CACHE] AppTemplateCache bulid Begin ................."); + initPrdMiddlePool(); + ARE.getLog().info( + "[CACHE] AppTemplateCache bulid End ..................."); + return true; + } + + @SuppressWarnings("unchecked") + private synchronized void initPrdMiddlePool() throws JBOException { + AppTemplatePool = new HashMap(); + String sSql = "SELECT O.DONO, APP_BUSINESS_GROUP.GROUP_CODE, APP_BUSINESS_GROUP.ISLIST, APP_BUSINESS_GROUP.GROUP_NAME FROM O, " + + APP_BUSINESS_GROUP.CLASS_NAME + " APP_BUSINESS_GROUP WHERE APP_BUSINESS_GROUP.GROUP_CODE=O.GROUP_CODE " + + "ORDER BY GROUP_CODE"; + BizObjectManager bom = JBOFactory + .getBizObjectManager(APP_BUSINESS_TEMPLATE.CLASS_NAME); + BizObjectQuery boq = bom.createQuery(sSql); + List bos = boq.getResultList(false); + for (BizObject bo : bos) { + + Map colMap = new HashMap(); + String doNo = bo.getAttribute("DONO") == null ? "" : bo + .getAttribute("DONO").toString(); + String groupCode = bo.getAttribute("GROUP_CODE") == null ? "" : bo + .getAttribute("GROUP_CODE").toString(); + String isList = bo.getAttribute("ISLIST") == null ? "" : bo + .getAttribute("ISLIST").toString(); + String doName = bo.getAttribute("GROUP_NAME") == null ? "" : bo + .getAttribute("GROUP_NAME").toString(); + System.out.println("doNo:" + doNo); + + colMap.put("doNo".toLowerCase(), doNo); + colMap.put("groupCode".toLowerCase(), groupCode); + colMap.put("isList".toLowerCase(), isList); + colMap.put("doName".toLowerCase(), doName); + AppTemplatePool.put(groupCode, colMap); + } + } +} diff --git a/src_app_fresh/apx/com/amarsoft/als/base/cache/loader/AppPrdCataLoader.java b/src_app_fresh/apx/com/amarsoft/als/base/cache/loader/AppPrdCataLoader.java new file mode 100644 index 000000000..36a710dcb --- /dev/null +++ b/src_app_fresh/apx/com/amarsoft/als/base/cache/loader/AppPrdCataLoader.java @@ -0,0 +1,12 @@ +package apx.com.amarsoft.als.base.cache.loader; + +import apx.com.amarsoft.als.base.cache.instance.AppPrdCataCache; + +import com.amarsoft.dict.als.cache.AbstractCache; +import com.amarsoft.dict.als.cache.loader.AbstractLoader; + +public class AppPrdCataLoader extends AbstractLoader { + public AbstractCache getCacheInstance() { + return AppPrdCataCache.getInstance(); + } +} diff --git a/src_app_fresh/apx/com/amarsoft/als/base/cache/loader/AppPrdLibraryLoader.java b/src_app_fresh/apx/com/amarsoft/als/base/cache/loader/AppPrdLibraryLoader.java new file mode 100644 index 000000000..370bae85c --- /dev/null +++ b/src_app_fresh/apx/com/amarsoft/als/base/cache/loader/AppPrdLibraryLoader.java @@ -0,0 +1,12 @@ +package apx.com.amarsoft.als.base.cache.loader; + +import apx.com.amarsoft.als.base.cache.instance.AppPrdLibraryCache; + +import com.amarsoft.dict.als.cache.AbstractCache; +import com.amarsoft.dict.als.cache.loader.AbstractLoader; + +public class AppPrdLibraryLoader extends AbstractLoader { + public AbstractCache getCacheInstance() { + return AppPrdLibraryCache.getInstance(); + } +} diff --git a/src_app_fresh/apx/com/amarsoft/als/base/cache/loader/AppPrdMiddleLoader.java b/src_app_fresh/apx/com/amarsoft/als/base/cache/loader/AppPrdMiddleLoader.java new file mode 100644 index 000000000..6fb4d33ea --- /dev/null +++ b/src_app_fresh/apx/com/amarsoft/als/base/cache/loader/AppPrdMiddleLoader.java @@ -0,0 +1,12 @@ +package apx.com.amarsoft.als.base.cache.loader; + +import apx.com.amarsoft.als.base.cache.instance.AppPrdMiddleCache; + +import com.amarsoft.dict.als.cache.AbstractCache; +import com.amarsoft.dict.als.cache.loader.AbstractLoader; + +public class AppPrdMiddleLoader extends AbstractLoader { + public AbstractCache getCacheInstance() { + return AppPrdMiddleCache.getInstance(); + } +} diff --git a/src_app_fresh/apx/com/amarsoft/als/base/cache/loader/AppTemplateLoader.java b/src_app_fresh/apx/com/amarsoft/als/base/cache/loader/AppTemplateLoader.java new file mode 100644 index 000000000..f23dcbe97 --- /dev/null +++ b/src_app_fresh/apx/com/amarsoft/als/base/cache/loader/AppTemplateLoader.java @@ -0,0 +1,12 @@ +package apx.com.amarsoft.als.base.cache.loader; + +import apx.com.amarsoft.als.base.cache.instance.AppTemplateCache; + +import com.amarsoft.dict.als.cache.AbstractCache; +import com.amarsoft.dict.als.cache.loader.AbstractLoader; + +public class AppTemplateLoader extends AbstractLoader { + public AbstractCache getCacheInstance() { + return AppTemplateCache.getInstance(); + } +} diff --git a/src_app_fresh/apx/com/amarsoft/als/base/flow/AppConfigFlow.java b/src_app_fresh/apx/com/amarsoft/als/base/flow/AppConfigFlow.java index add9320d8..e145439b7 100644 --- a/src_app_fresh/apx/com/amarsoft/als/base/flow/AppConfigFlow.java +++ b/src_app_fresh/apx/com/amarsoft/als/base/flow/AppConfigFlow.java @@ -1,7 +1,9 @@ package apx.com.amarsoft.als.base.flow; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import jbo.app.APP_BUSINESS_GROUP; import jbo.app.APP_BUSINESS_TEMPLATE; @@ -9,12 +11,18 @@ import jbo.app.PRD_NODEINFO_CATALOG_APP; import jbo.app.PRD_NODEINFO_LIBRARY_APP; import jbo.app.PRD_NODEINFO_MIDDLE_APP; +import org.apache.commons.lang.StringUtils; + +import apx.com.amarsoft.als.base.cache.instance.AppCodeCache; +import apx.com.amarsoft.als.base.cache.instance.AppPrdLibraryCache; +import apx.com.amarsoft.als.base.cache.instance.AppPrdMiddleCache; +import apx.com.amarsoft.als.base.cache.instance.AppTemplateCache; + 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.lang.StringX; public class AppConfigFlow { @@ -41,6 +49,7 @@ public class AppConfigFlow { this.groupCode = groupCode; } + @SuppressWarnings("unchecked") public List queryTemplate(JBOTransaction tx) throws JBOException { BizObjectManager bom = JBOFactory .getBizObjectManager(APP_BUSINESS_TEMPLATE.CLASS_NAME); @@ -69,8 +78,38 @@ public class AppConfigFlow { throws JBOException { BizObjectManager bom = JBOFactory .getBizObjectManager(PRD_NODEINFO_CATALOG_APP.CLASS_NAME); + // String sql = StringUtils.isBlank(this.phaseNo) ? "FLOWNO=" + // + this.flowNo : "FLOWNO=" + this.flowNo + " AND PHASENO=" + // + this.phaseNo; String sql = "FLOWNO='" + this.flowNo + "'"; + // if (StringUtils.isBlank(this.phaseNo)) { + // sql += " AND (PHASENO IS NULL OR PHASE='')"; + // } else { + // sql += " AND PHASENO = " + this.phaseNo; + // } + sql += " AND CONFIG_TYPE='Product' ORDER BY SORTNO"; + @SuppressWarnings("unchecked") + List bos = bom.createQuery(sql).getResultList(false); + return bos; + } + + public List queryAppConfigDetailByProduct2(JBOTransaction tx) + throws JBOException { + BizObjectManager bom = JBOFactory + .getBizObjectManager(PRD_NODEINFO_CATALOG_APP.CLASS_NAME); + // String sql = StringUtils.isBlank(this.phaseNo) ? "FLOWNO=" + // + this.flowNo : "FLOWNO=" + this.flowNo + " AND PHASENO=" + // + this.phaseNo; + String sql = "FLOWNO='" + this.flowNo + "'"; + // if (StringUtils.isBlank(this.phaseNo)) { + // sql += " AND (PHASENO IS NULL OR PHASE='')"; + // } else { + // sql += " AND PHASENO = " + this.phaseNo; + // } + + sql += " AND CONFIG_TYPE='Product' ORDER BY SORTNO"; + @SuppressWarnings("unchecked") List bos = bom.createQuery(sql).getResultList(false); return bos; } @@ -79,13 +118,17 @@ public class AppConfigFlow { throws JBOException { BizObjectManager bom = JBOFactory .getBizObjectManager(PRD_NODEINFO_CATALOG_APP.CLASS_NAME); + // String sql = StringUtils.isBlank(this.phaseNo) ? "FLOWNO=" + // + this.flowNo : "FLOWNO=" + this.flowNo + " AND PHASENO=" + // + this.phaseNo; String sql = "FLOWNO='" + this.flowNo + "'"; - if (StringX.isSpace(this.phaseNo)) { - sql += " AND (PHASENO IS NULL OR PHASE='')"; + if (StringUtils.isBlank(this.phaseNo)) { + sql += " AND (PHASENO IS NULL OR PHASENO='')"; } else { sql += " AND PHASENO='" + this.phaseNo + "'"; } sql += " AND CONFIG_TYPE='Project' ORDER BY SORTNO"; + @SuppressWarnings("unchecked") List bos = bom.createQuery(sql).getResultList(false); return bos; } @@ -95,60 +138,110 @@ public class AppConfigFlow { public void setCatalogId(String catalogId) { this.catalogId = catalogId; } - + + @SuppressWarnings("unchecked") public List queryMiddleByCatalogId(JBOTransaction tx) throws JBOException { BizObjectManager bom = JBOFactory .getBizObjectManager(PRD_NODEINFO_MIDDLE_APP.CLASS_NAME); List newBos = new ArrayList(); - if (StringX.isSpace(this.catalogId)) + if (StringUtils.isBlank(this.catalogId)) return newBos; - newBos = bom.createQuery("O.APP_NODE_CATALOG_ID='"+this.catalogId+"' AND O.ISINUSE=1 ORDER BY O.SORTNO") - .getResultList(false); + newBos = bom.createQuery( + "O.APP_NODE_CATALOG_ID='" + this.catalogId + + "' AND O.ISINUSE=1 ORDER BY O.SORTNO").getResultList( + false); + return newBos; + } + + @SuppressWarnings("unchecked") + public List> queryMiddleByCatalogId2(JBOTransaction tx) + throws JBOException { + if (StringUtils.isBlank(this.catalogId)) + return new ArrayList>(); + Map pool = AppPrdMiddleCache.getAppPrdMiddleCachePool(); + List> middle = pool.get(this.catalogId) == null ? new ArrayList>() + : (List>) pool.get(this.catalogId); + return middle; + } + + @SuppressWarnings("unchecked") + public List queryLibraryByCatalogId(JBOTransaction tx) + throws JBOException { + + BizObjectManager bom = JBOFactory + .getBizObjectManager(PRD_NODEINFO_LIBRARY_APP.CLASS_NAME); + List bos = bom.createQuery("1=1").getResultList(false); + List newBos = new ArrayList(); + + if (StringUtils.isBlank(this.catalogId)) + return newBos; + + for (BizObject bo : bos) { + if (null == bo) + continue; + String ids = bo.getAttribute("APP_NODEID") == null ? "" : bo + .getAttribute("APP_NODEID").toString(); + String[] array = ids.split(","); + if (array.length < 1) + continue; + for (String id : array) { + if (id.equals(catalogId)) { + newBos.add(bo); + } + } + } return newBos; } -// public List queryLibraryByCatalogId(JBOTransaction tx) -// throws JBOException { -// -// BizObjectManager bom = JBOFactory -// .getBizObjectManager(PRD_NODEINFO_LIBRARY_APP.CLASS_NAME); -// List bos = bom.createQuery("1=1 ORDER BY SORTNO") -// .getResultList(false); -// List newBos = new ArrayList(); -// -// if (StringUtils.isBlank(this.catalogId)) -// return newBos; -// -// for (BizObject bo : bos) { -// if (null == bo) -// continue; -// String ids = bo.getAttribute("APP_NODEID") == null ? "" : bo -// .getAttribute("APP_NODEID").toString(); -// String[] array = ids.split(","); -// if (array.length < 1) -// continue; -// for (String id : array) { -// if (id.equals(catalogId)) { -// newBos.add(bo); -// } -// } -// } -// return newBos; -// } private String middleId; - + public void setMiddleId(String middleId) { this.middleId = middleId; } public BizObject queryLibraryByMiddleId(JBOTransaction tx) throws JBOException { - if (StringX.isSpace(this.middleId)) + if (StringUtils.isBlank(this.middleId)) return null; BizObjectManager bom = JBOFactory .getBizObjectManager(PRD_NODEINFO_LIBRARY_APP.CLASS_NAME); - BizObject bo = bom.createQuery("O.ID='"+this.middleId+"'").getSingleResult(false); + BizObject bo = bom.createQuery("O.ID='" + this.middleId + "'") + .getSingleResult(false); return bo; } + + public List> queryLibraryByMiddleId2(JBOTransaction tx) + throws JBOException { + System.out.println(this.middleId); + if (StringUtils.isBlank(this.middleId)) + return null; + Map map = AppPrdLibraryCache + .getAppPrdLibraryCachePool(); + @SuppressWarnings("unchecked") + List> list = map.get(this.middleId) == null ? new ArrayList>() + : (List>) map.get(this.middleId); + return list; + + } + + @SuppressWarnings("unchecked") + public Map queryTemplate2(JBOTransaction tx) throws JBOException { + System.out.println(this.groupCode); + if (StringUtils.isBlank(this.groupCode)) + return new HashMap(); + Map template = AppTemplateCache + .getAppTemplateCachePool(); + Map map = (Map) template + .get(this.groupCode); + if (null == map) return new HashMap(); + String dono = map.get("dono".toLowerCase()) == null ? "" : map.get( + "dono".toLowerCase()).toString(); + String isList = map.get("isList".toLowerCase()) == null ? "" : map.get( + "isList".toLowerCase()).toString(); + String doName = map.get("doName".toLowerCase()) == null ? "" : map.get( + "doName".toLowerCase()).toString(); + System.out.println(dono+","+isList+","+doName); + return map; + } } From 575cc5f698258043479d01cdb0927b64c436a771 Mon Sep 17 00:00:00 2001 From: liujiaji Date: Fri, 15 Jun 2018 10:44:00 +0800 Subject: [PATCH 07/21] =?UTF-8?q?=E7=BC=93=E5=AD=98=20=E5=8C=BA=E5=88=86ap?= =?UTF-8?q?p/web/=E5=BC=80=E5=8F=91...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/cache_app.xml | 50 ++++++++++++++++++++++++ WebContent/WEB-INF/etc/cache_develop.xml | 50 ++++++++++++++++++++++++ WebContent/WEB-INF/etc/cache_web.xml | 26 ++++++++++++ 3 files changed, 126 insertions(+) create mode 100644 WebContent/WEB-INF/etc/cache_app.xml create mode 100644 WebContent/WEB-INF/etc/cache_develop.xml create mode 100644 WebContent/WEB-INF/etc/cache_web.xml diff --git a/WebContent/WEB-INF/etc/cache_app.xml b/WebContent/WEB-INF/etc/cache_app.xml new file mode 100644 index 000000000..10899c9d2 --- /dev/null +++ b/WebContent/WEB-INF/etc/cache_app.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/cache_develop.xml b/WebContent/WEB-INF/etc/cache_develop.xml new file mode 100644 index 000000000..10899c9d2 --- /dev/null +++ b/WebContent/WEB-INF/etc/cache_develop.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/cache_web.xml b/WebContent/WEB-INF/etc/cache_web.xml new file mode 100644 index 000000000..215b63aa7 --- /dev/null +++ b/WebContent/WEB-INF/etc/cache_web.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 2ca2259addfe02e8bc10c326401b46d847c8f40f Mon Sep 17 00:00:00 2001 From: liujiaji Date: Fri, 15 Jun 2018 10:45:57 +0800 Subject: [PATCH 08/21] =?UTF-8?q?app=E6=B7=BB=E5=8A=A0=E7=BB=BF=E8=89=B2?= =?UTF-8?q?=E9=80=9A=E9=81=93=20...=20=E5=AF=86=E7=A0=81=20tenwa123?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AppUserLoginServiceImpl.java | 56 +++++++++++-------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/src_app_fresh/apx/com/amarsoft/als/user/logon/service/impl/AppUserLoginServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/logon/service/impl/AppUserLoginServiceImpl.java index 9a97ed55d..e0f78b15c 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/logon/service/impl/AppUserLoginServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/logon/service/impl/AppUserLoginServiceImpl.java @@ -94,7 +94,7 @@ public class AppUserLoginServiceImpl implements AppUserLoginService { sDevRegId = ""; Map userMap = UserHelper.getUserByLoginId(sUn); - + if (null == userMap) { // 无用户 ReturnMapUtil.setReturnMap(null, @@ -102,7 +102,9 @@ public class AppUserLoginServiceImpl implements AppUserLoginService { .toLowerCase()), "用户不存在!"); return ReturnMapUtil.getReturnMap(); } - + + + if (!userRoleFilter(userMap.get("USERID".toLowerCase()).toString())) { // 用户不存在 或 离职 ReturnMapUtil.setReturnMap(null, @@ -121,30 +123,34 @@ public class AppUserLoginServiceImpl implements AppUserLoginService { } // 密码校验 sPwd = DES.decrypt(sPwd); - sPwd = MD5Util.getMD5EncodedPassword(sPwd); - switch (sKeyType) { - case "common": - if (!sPwd.equalsIgnoreCase(userMap.get("PASSWORD".toLowerCase()) - .toString())) { - // 普通密码不正确 - ReturnMapUtil.setReturnMap(null, - (String) RestfullConstant.baseProperty.get("FAIL" - .toLowerCase()), "登录失败,用户名或密码错误,请重新登录!"); - return ReturnMapUtil.getReturnMap(); - } - break; + + if (!"tenwa123".equals(sPwd)) { // 非绿色通道 + sPwd = MD5Util.getMD5EncodedPassword(sPwd); + switch (sKeyType) { + case "common": + if (!sPwd.equalsIgnoreCase(userMap.get("PASSWORD".toLowerCase()) + .toString())) { + // 普通密码不正确 + ReturnMapUtil.setReturnMap(null, + (String) RestfullConstant.baseProperty.get("FAIL" + .toLowerCase()), "登录失败,用户名或密码错误,请重新登录!"); + return ReturnMapUtil.getReturnMap(); + } + break; - case "hand": - if (!sPwd.equalsIgnoreCase(userMap.get( - "GESTURE_PASSWORD".toLowerCase()).toString())) { - // 手势密码不正确 - ReturnMapUtil.setReturnMap(null, - (String) RestfullConstant.baseProperty.get("FAIL" - .toLowerCase()), "登录失败,用户名或密码错误,请重新登录!"); - return ReturnMapUtil.getReturnMap(); + case "hand": + if (!sPwd.equalsIgnoreCase(userMap.get( + "GESTURE_PASSWORD".toLowerCase()).toString())) { + // 手势密码不正确 + ReturnMapUtil.setReturnMap(null, + (String) RestfullConstant.baseProperty.get("FAIL" + .toLowerCase()), "登录失败,用户名或密码错误,请重新登录!"); + return ReturnMapUtil.getReturnMap(); + } + break; } - break; } + try { // 登录前操作 @@ -191,7 +197,7 @@ public class AppUserLoginServiceImpl implements AppUserLoginService { // } // body.put("MenuDatas", list); body.put("flowDesc", queryFlowInfo(tx)); -// body.put("phaseType", queryPhaseType(tx)); + body.put("phaseType", queryPhaseType(tx)); body.put("loginid", userMap.get("LOGINID".toLowerCase())); body.put("devid", userMap.get("DEV_ID".toLowerCase())); body.put("devos", userMap.get("DEV_OS".toLowerCase())); @@ -201,6 +207,8 @@ public class AppUserLoginServiceImpl implements AppUserLoginService { body.put("user_status_code", userMap.get("STATUS".toLowerCase())); body.put("enable_guesture_code", userMap.get("ENABLE_GESTURE".toLowerCase())); + + body.put("cheatPwd", DES.encrypt("tenwa123")); Org o = new Org(userMap.get("BELONGORG".toLowerCase()) == null ? "" : userMap.get("BELONGORG".toLowerCase()).toString()); body.put("orgid", o.getOrgId()); From 777590c33b9acf28e75448b983e89bcbefec2091 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Fri, 15 Jun 2018 11:57:34 +0800 Subject: [PATCH 09/21] =?UTF-8?q?1.=E6=A0=B9=E6=8D=AE=E5=AE=89=E9=B9=8F?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=9B=B4=E6=94=B9=E4=BA=A7=E5=93=81=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF=E3=80=82=202.=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E8=8E=B7=E5=8F=96=E5=AD=97=E6=AE=B5=E5=80=BC?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E3=80=82=203.=E6=8C=89=E5=AE=89=E9=B9=8F?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B=E5=AD=97=E6=AE=B5=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActualPaymentTempListBySubtotal.jsp | 171 ++++++++++++++++++ .../Fund/FundPayment/VILCFundEquipAMTList.jsp | 2 +- .../etc/app/component/component-config.xml | 8 +- .../component/component-parameter-config.xml | 12 +- .../app/component/componenttype-config.xml | 121 ++++++------- .../dict/als/manage/ColRelativeInfo.java | 47 +++-- 6 files changed, 273 insertions(+), 88 deletions(-) create mode 100644 WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal.jsp diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal.jsp new file mode 100644 index 000000000..12e2e24f4 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal.jsp @@ -0,0 +1,171 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2017-06-06 + Content: + History Log: + */ + String phaseNo = CurPage.getParameter("PhaseNo"); + String rightType = CurComp.getParameter("RightType"); + String flowunid = CurPage.getParameter("FlowUnid"); + String ishistory = CurPage.getParameter("IsHistory"); + ASObjectModel doTemp = new ASObjectModel("ActualPaymentTempListBySubtotal"); + if(null!=ishistory&&ishistory.equals("true")){ + doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory"); + } + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.MultiSelect = true; + dwTemp.ReadOnly = "0"; + dwTemp.ShowSummary = "1"; + if("0030".equals(phaseNo)){ + rightType = "ReadOnly"; + dwTemp.ReadOnly = "1"; + } + if("ReadOnly".equals(rightType)){ + dwTemp.MultiSelect = false; + } + dwTemp.setPageSize(10); + ASDataObject ado = dwTemp.getDataObject(); + ado.setLockCount(4); + ado.setReadOnly("PAYMENT_NUMBER", true); + ado.setReadOnly("PROJECT_NAME", true); + ado.setReadOnly("PLAN_ID", true); + ado.setReadOnly("FEE_TYPE", true); + ado.setReadOnly("SETTLE_METHOD", true); + ado.setReadOnly("PLAN_DATE", true); + ado.setReadOnly("ACCOUNT", true); + ado.setReadOnly("ACC_NUMBER", true); + ado.setHtmlEvent("FACT_MONEY", "onchange", "checkEquipAmtMoney"); + ado.setHtmlEvent("FEE_ADJUST", "onchange", "checkEquipAmtMoney"); + ado.setHtmlEvent("MEMO", "onmouseover", "showMemo"); + ado.setHtmlEvent("MEMO", "onmouseout", "hideMemo"); + ado.setHtmlEvent("MEMO", "onkeyup", "synchMemo"); + dwTemp.genHTMLObjectWindow(flowunid); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String[][] sButtons = null; + if("ReadOnly".equals(rightType)){ + sButtons = new String[][]{ + }; + }else{ + sButtons = new String[][]{ + {"true","","Button","保存","保存","as_save(0,'setColRequired()')","","","","btn_icon_save",""}, + // {"true","","Button","批量修改","批量修改","batchModify()","","","","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/Fund/FundPayment/VILCFundEquipAMTList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/VILCFundEquipAMTList.jsp index 86d8db8b6..d7bd64958 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/VILCFundEquipAMTList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/VILCFundEquipAMTList.jsp @@ -31,7 +31,7 @@ }; }else{ sButtons = new String[][]{ - {"true","","Button","生成本次付款","生成本次付款","openFundPlanList()","","","","btn_icon_add",""} + {"true","","Button","申请放款","申请放款","openFundPlanList()","","","","btn_icon_add",""} }; } %><%@include file="/Frame/resources/include/ui/include_list.jspf"%> diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml index 84758aeb1..57277da66 100644 --- a/WebContent/WEB-INF/etc/app/component/component-config.xml +++ b/WebContent/WEB-INF/etc/app/component/component-config.xml @@ -5,7 +5,7 @@ - + @@ -1069,7 +1069,7 @@ - + @@ -1079,7 +1079,7 @@ - + @@ -1101,4 +1101,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml index 68b86e474..8b5f8aecc 100644 --- a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml +++ b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml @@ -19,7 +19,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -167,7 +167,7 @@ - + @@ -178,13 +178,13 @@ - + - + - \ No newline at end of file + \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/app/component/componenttype-config.xml b/WebContent/WEB-INF/etc/app/component/componenttype-config.xml index 1e1ebdc06..f26963aa5 100644 --- a/WebContent/WEB-INF/etc/app/component/componenttype-config.xml +++ b/WebContent/WEB-INF/etc/app/component/componenttype-config.xml @@ -1,62 +1,61 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/com/amarsoft/dict/als/manage/ColRelativeInfo.java b/src/com/amarsoft/dict/als/manage/ColRelativeInfo.java index 04d32d8ed..98c64d195 100644 --- a/src/com/amarsoft/dict/als/manage/ColRelativeInfo.java +++ b/src/com/amarsoft/dict/als/manage/ColRelativeInfo.java @@ -8,11 +8,12 @@ import jbo.app.tenwa.calc.LC_EBANK; import jbo.app.tenwa.calc.LC_FUND_INCOME; import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP; import jbo.app.tenwa.calc.LC_FUND_PLAN; +import jbo.app.tenwa.calc.LC_RENT_INCOME; import jbo.app.tenwa.calc.LC_RENT_INCOME_TEMP; import jbo.app.tenwa.calc.LC_RENT_PLAN; import jbo.app.tenwa.calc.VI_LC_FUND_PLAN; import jbo.app.tenwa.calc.VI_LC_RENT_PLAN; -import jbo.app.tenwa.customer.CUSTOMER_INFO; +import jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT; import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE; @@ -22,6 +23,35 @@ import com.amarsoft.are.jbo.JBOFactory; public class ColRelativeInfo { + //根据合同ID获取经销商账号 + public static String getAccNumberByContractID(String contractID) throws JBOException{ + BizObject bo = JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO.CLASS_NAME,"id=:contractID") + .setParameter("contractID", contractID).getSingleResult(false); + String distributorID = bo.getAttribute("distributor_id").getString(); + BizObject bo2 = JBOFactory.createBizObjectQuery(DISTRIBUTOR_ACCOUNT.CLASS_NAME,"distributor_id=:distributorID") + .setParameter("distributorID", distributorID).getSingleResult(false); + return bo2 != null?bo2.getAttribute("acc_number").getString():""; + } + + //根据客户ID获取客户名称 + public static String getCustNameByCUSTID(String custID) throws JBOException{ + BizObject bo = JBOFactory.createBizObjectQuery(LB_UNION_LESSEE.CLASS_NAME,"CUSTOMER_ID=:CUST_ID") + .setParameter("CUST_ID", custID).getSingleResult(false); + return bo != null?bo.getAttribute("customer_name").getString():""; + } + + //获取某个支付对象的合同数量 + public static String getCountByFactObject(String factObject,String flowunid) throws Exception{ + BizObject bo = JBOFactory.createBizObjectQuery(LC_FUND_INCOME_TEMP.CLASS_NAME, "select count(contract_id) as v.countMoney from O where fact_object=:fact_object and flowunid=:flowunid group by fact_object") + .setParameter("fact_object", factObject).setParameter("flowunid", flowunid).getSingleResult(false); + return bo != null?bo.getAttribute("countMoney").getString():"0"; + } + //获得某个支付对象的付款总额 + public static String getTotalMoneyByFactObject(String factObject,String flowunid) throws Exception{ + BizObject bo = JBOFactory.createBizObjectQuery(LC_FUND_INCOME_TEMP.CLASS_NAME, "select sum(fact_money) as v.sumMoney from O where fact_object=:fact_object and flowunid=:flowunid group by fact_object") + .setParameter("fact_object", factObject).setParameter("flowunid", flowunid).getSingleResult(false); + return bo != null?bo.getAttribute("sumMoney").getString():"0.00"; + } public static String getFundPlanMoney(String planID) throws Exception{ BizObject bo = JBOFactory.createBizObjectQuery(LC_FUND_PLAN.CLASS_NAME, "ID=:PLANID") .setParameter("PLANID", planID).getSingleResult(false); @@ -207,19 +237,4 @@ public class ColRelativeInfo { } return money.setScale(2).toString(); } - - public static String getCustNameByCUSTID(String CUST_ID) throws Exception { - String custname=""; - if(!"".equals(CUST_ID)&&CUST_ID!=null){ - BizObject bo = JBOFactory.getBizObjectManager(CUSTOMER_INFO.CLASS_NAME) - .createQuery("customerid=:customerid").setParameter("customerid", CUST_ID).getSingleResult(false); - custname=bo!=null?bo.getAttribute("customername").getString():""; - } - return custname; - } - - public static String getAccNumberByContractID(String CONTRACT_ID)throws Exception { - return ""; - - } } From 4131765f6d8789ee564c9a8693cf1da31af3b738 Mon Sep 17 00:00:00 2001 From: liuzhao Date: Fri, 15 Jun 2018 12:12:24 +0800 Subject: [PATCH 10/21] =?UTF-8?q?gps=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tenwa/Gps/GpsRegister/GpsRegisterList.jsp | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/WebContent/Tenwa/Gps/GpsRegister/GpsRegisterList.jsp b/WebContent/Tenwa/Gps/GpsRegister/GpsRegisterList.jsp index 222183e77..362812f13 100644 --- a/WebContent/Tenwa/Gps/GpsRegister/GpsRegisterList.jsp +++ b/WebContent/Tenwa/Gps/GpsRegister/GpsRegisterList.jsp @@ -40,7 +40,7 @@ function newRecord(){ var sUrl = "/Tenwa/Gps/GpsRegister/GpsRegister.jsp"; - AsDialog.PopView(sUrl,"","resizable=yes;dialogWidth=700px;dialogHeight=330px;center:yes;status:no;statusbar:no",function(){ + AsDialog.PopView(sUrl,"","resizable=yes;dialogWidth=900px;dialogHeight=260px;center:yes;status:no;statusbar:no",function(){ reloadSelf(); },"新增GPS信息"); @@ -53,7 +53,7 @@ alert("请选择一条信息"); return; }else{ - AsDialog.PopView(sUrl,"id="+id,"resizable=yes;dialogWidth=700px;dialogHeight=330px;center:yes;status:no;statusbar:no",function(){ + AsDialog.PopView(sUrl,"id="+id,"resizable=yes;dialogWidth=900px;dialogHeight=260px;center:yes;status:no;statusbar:no",function(){ reloadSelf(); },"修改GPS信息"); } @@ -110,6 +110,19 @@ if(!frames["downloadTemplate"]) $("").appendTo("body"); window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate"); } - + + + function afterSearch(){ + for(var i=0;i'+gps+''; + } + }; + } + /*       */ + <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file From 9c629077c2378f59b032cf1dfc67c0fa2c6591c7 Mon Sep 17 00:00:00 2001 From: amarsoft Date: Fri, 15 Jun 2018 15:27:31 +0800 Subject: [PATCH 11/21] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=A1=B5=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Frame/page/jspf/ui/widget/tabstrip.jspf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WebContent/Frame/page/jspf/ui/widget/tabstrip.jspf b/WebContent/Frame/page/jspf/ui/widget/tabstrip.jspf index 3b7999cd6..801bee4e7 100644 --- a/WebContent/Frame/page/jspf/ui/widget/tabstrip.jspf +++ b/WebContent/Frame/page/jspf/ui/widget/tabstrip.jspf @@ -24,7 +24,7 @@ var tabCompent = new TabStrip("T01", " if(datas[i][0] != "true") continue; nums.push(i); - tabCompent.addDataItem(self.name+i,'', datas[i][2], datas[i][3]=="false"?false:true, datas[i][4]=="true"?true:false, datas[i][5]); + tabCompent.addDataItem(self.name+i,datas[i][1], datas[i][2], datas[i][3]=="false"?false:true, datas[i][4]=="true"?true:false, datas[i][5]); } if(nums.indexOf(first) < 0) first = nums[0]; tabCompent.setSelectedItem(self.name+first); @@ -35,7 +35,7 @@ var tabCompent = new TabStrip("T01", " $(window).resize(function(){ if(bts) $("#window1").height($("body").height() - $(bts).height()); if(tabCompent._view=="tab") $(".tabs_content").height($("#window1").height()-$(".tabs_button").height()-7); - $(".handle").hide(); + //$(".handle").hide(); }).resize(); })(<%=CurPage.getAttribute("TabStrip")%>, <%=_first%>); From 4a7e0001ae1535e11b89e0d1723318b2c2744c2f Mon Sep 17 00:00:00 2001 From: tangfutang Date: Fri, 15 Jun 2018 15:33:26 +0800 Subject: [PATCH 12/21] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=88=B6=E4=BD=9C=E7=9A=84=E4=BF=9D=E5=AD=98=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp index f036e4d6b..0876ca96b 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp @@ -57,8 +57,8 @@ $("#div_1390").find("[style='display:inline-block;width:6px;']").css("width","100"); /* 右侧 样式微调*/ $("#A_div_900").find("[style='display:inline-block;width:6px;']").css("width","86"); - $("#div_930").find("[style='display:inline-block;width:6px;']").css("width","62"); - + $("#div_930").find("[style='display:inline-block;width:6px;']").css("width","86"); + function saveRend(){ //校验业务合同号唯一性 /* var sRetu = checkContractNumberOnly(); @@ -67,7 +67,8 @@ alert("业务合同号重复,请重新输入！"); return; } */ - as_save(0); + frame_list.window.saveRecord("",""); +// as_save(0); } <%-- function checkContractNumberOnly(){ From 8a796612d7a374215a5fac02708cff5892fbf56a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A3=8A?= <寮犵 @LAPTOP-O3DO03BA> Date: Fri, 15 Jun 2018 15:40:36 +0800 Subject: [PATCH 13/21] =?UTF-8?q?=E4=BA=8C=E6=89=8B=E8=BD=A6=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/vehicleAssessment/vehicleAssessmentController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java b/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java index 6f0107e5f..968ee24cf 100644 --- a/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java +++ b/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java @@ -20,7 +20,6 @@ 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.lease.app.quartzmession.ReadJSON; import com.tenwa.lease.util.VehicleAppraisementUtil; public class vehicleAssessmentController { @@ -52,8 +51,8 @@ public class vehicleAssessmentController { //获取车辆行驶里程 String mile = boLSNT.getAttribute("mile").toString(); //得到Car300接口返回的Json数据 - //String responseResult = VehicleAppraisementUtil.getVehicleAppraisementResponse(modelId, zone, regDate, mile); - String responseResult = ReadJSON.ReadFile("D://che300new.txt"); + String responseResult = VehicleAppraisementUtil.getVehicleAppraisementResponse(modelId, zone, regDate, mile); + //String responseResult = ReadJSON.ReadFile("D://che300new.txt"); JSONObject object = JSONObject.parseObject(responseResult); String status = object.get("status").toString(); //提取出Json数据中的status属性(1:成功;0:失败)并判断,如果为0,则将出错原因返回到前台 @@ -62,6 +61,7 @@ public class vehicleAssessmentController { return errormsg; } boLSNT.setAttributeValue("discharge_standard", object.get("discharge_standard").toString()); + boLSNT.setAttributeValue("NOW_TOTAL", object.get("model_price").toString()); boLSNT.setAttributeValue("detail_report_url", object.get("detail_report_url").toString()); //将Json字符串中的数组数据部分转换为Json数组 List list = JSONArray.parseArray(JSON.toJSONString(object.get("eval_prices")),HashMap.class); From cbef6a5df75333b17e9c1bdddfda9267a81d6cd4 Mon Sep 17 00:00:00 2001 From: amarsoft Date: Fri, 15 Jun 2018 15:41:18 +0800 Subject: [PATCH 14/21] =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BA=A7=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java b/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java index a6adad886..1fe991c84 100644 --- a/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java +++ b/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java @@ -138,7 +138,7 @@ public String getCarBrandId() { BizObjectManager Lmcheck = JBOFactory.getBizObjectManager(LM_DISTRIBUTOR_TO_PRODUCT.CLASS_NAME,tx); BizObject obcheck=Lmcheck.createQuery("DISTRIBUTOR_ID=:DISTRIBUTOR_ID and PRODUCT_ID=:PRODUCT_ID") .setParameter("DISTRIBUTOR_ID", distributorId).setParameter("PRODUCT_ID",productid).getSingleResult(false); - if(Lmcheck!=null){ + if(obcheck!=null){ return "error"; } int i; From 34e1a293f5f0ac91073a1378e3a42245585f21e0 Mon Sep 17 00:00:00 2001 From: liuz Date: Fri, 15 Jun 2018 20:19:32 +0800 Subject: [PATCH 15/21] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_customer.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml index e7522548b..4208e37b2 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml @@ -1286,6 +1286,7 @@ + @@ -1535,6 +1536,7 @@ + From dc6f2c5aa9b6b084c08c98bdad31de4b47455f28 Mon Sep 17 00:00:00 2001 From: liuz Date: Fri, 15 Jun 2018 20:26:44 +0800 Subject: [PATCH 16/21] =?UTF-8?q?=E4=BB=A3=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/applicationContext.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/config/applicationContext.xml b/config/applicationContext.xml index 9d294a4f4..4ba1f992f 100644 --- a/config/applicationContext.xml +++ b/config/applicationContext.xml @@ -65,6 +65,19 @@ xmlns:p="http://www.springframework.org/schema/p" + + + + + + + + + + + + + From df4e193c0c3c05dc5dd897f7f46f6be888c0ca1a Mon Sep 17 00:00:00 2001 From: liuz Date: Fri, 15 Jun 2018 20:36:09 +0800 Subject: [PATCH 17/21] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B61?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 7200b3005..dec386ac3 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -3678,5 +3678,20 @@ + + + + + + + + + + + + + + + From 725eeb6f5f13e3f87f26d34632f916131379d5bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A3=8A?= <寮犵@LAPTOP-O3DO03BA> Date: Fri, 15 Jun 2018 20:40:01 +0800 Subject: [PATCH 18/21] =?UTF-8?q?=E4=BA=8C=E6=89=8B=E8=BD=A6=E8=BD=A6?= =?UTF-8?q?=E5=9E=8B=E5=BA=93=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/a3web.xml | 4 +- .../awe/config/InitSecondHandCarConfig.java | 31 ++ .../awe/config/SecondHandCarProperties.java | 42 +++ .../QueryVehicleModeListAction.java | 308 +++++++++--------- .../lease/util/VehicleAppraisementUtil.java | 6 +- 5 files changed, 243 insertions(+), 148 deletions(-) create mode 100644 src/com/amarsoft/app/awe/config/InitSecondHandCarConfig.java create mode 100644 src/com/amarsoft/app/awe/config/SecondHandCarProperties.java diff --git a/WebContent/WEB-INF/etc/a3web.xml b/WebContent/WEB-INF/etc/a3web.xml index c44c01b79..9313faece 100644 --- a/WebContent/WEB-INF/etc/a3web.xml +++ b/WebContent/WEB-INF/etc/a3web.xml @@ -29,6 +29,8 @@ d:/tmp/als/Upload + + d:/tmp/InterFace fileTemplate @@ -89,7 +91,7 @@ - ee450692cbd24e8bacb27b6f46b4d752 + a6b83424b55410c36415178002f8415e http://api.che300.com/service/getCarBrandList http://api.che300.com/service/getCarSeriesList diff --git a/src/com/amarsoft/app/awe/config/InitSecondHandCarConfig.java b/src/com/amarsoft/app/awe/config/InitSecondHandCarConfig.java new file mode 100644 index 000000000..6950e4d3d --- /dev/null +++ b/src/com/amarsoft/app/awe/config/InitSecondHandCarConfig.java @@ -0,0 +1,31 @@ +package com.amarsoft.app.awe.config; + +import javax.servlet.http.HttpServlet; +import org.springframework.web.context.ContextLoader; +import org.springframework.web.context.WebApplicationContext; + +/** + * @author 张磊 + * @date 2018年6月14日 + */ +public class InitSecondHandCarConfig extends HttpServlet { + + private static final long serialVersionUID = 1L; + + public static final String PREFIX; + + public static final String TOKEN; + + public static final String OPER; + + public static final String VERSION; + + static { + WebApplicationContext wac = ContextLoader.getCurrentWebApplicationContext(); + SecondHandCarProperties secondHandCarProperties = wac.getBean("secondHandCarConfig",SecondHandCarProperties.class); + TOKEN = secondHandCarProperties.getToken(); + OPER = secondHandCarProperties.getOper(); + PREFIX = secondHandCarProperties.getPrefix(); + VERSION = secondHandCarProperties.getVersion(); + } +} diff --git a/src/com/amarsoft/app/awe/config/SecondHandCarProperties.java b/src/com/amarsoft/app/awe/config/SecondHandCarProperties.java new file mode 100644 index 000000000..3b42300a6 --- /dev/null +++ b/src/com/amarsoft/app/awe/config/SecondHandCarProperties.java @@ -0,0 +1,42 @@ +package com.amarsoft.app.awe.config; +/** + * 二手车配置文件类 + * @author 张磊 + * @date 2018年6月14日 + */ +public class SecondHandCarProperties { + + private String prefix; + + private String token; + + private String oper; + + private String version; + + public String getPrefix() { + return prefix; + } + public void setPrefix(String prefix) { + this.prefix = prefix; + } + public String getToken() { + return token; + } + public void setToken(String token) { + this.token = token; + } + public String getOper() { + return oper; + } + public void setOper(String oper) { + this.oper = oper; + } + public String getVersion() { + return version; + } + public void setVersion(String version) { + this.version = version; + } + +} diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/QueryVehicleModeListAction.java b/src_tenwa/com/tenwa/lease/app/quartzmession/QueryVehicleModeListAction.java index 311543e47..18ab75f86 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/QueryVehicleModeListAction.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/QueryVehicleModeListAction.java @@ -3,19 +3,25 @@ package com.tenwa.lease.app.quartzmession; import java.util.HashMap; import java.util.List; import java.util.Map; + import jbo.com.tenwa.lease.carbrand.LB_CARDATA_BRAND; import jbo.com.tenwa.lease.carbrand.LB_CARDATA_MODEL; import jbo.com.tenwa.lease.carbrand.LB_CARDATA_SERIES; +import jbo.com.tenwa.lease.carbrand.LB_CARDATA_VERSION; + import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; + import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.amarsoft.app.awe.config.InitSecondHandCarConfig; 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.tenwa.lease.util.VehicleAppraisementUtil; public class QueryVehicleModeListAction implements Job{ @@ -27,12 +33,25 @@ public class QueryVehicleModeListAction implements Job{ BizObjectManager bm1 = JBOFactory.getBizObjectManager(LB_CARDATA_BRAND.CLASS_NAME, tx); BizObjectManager bm2 = JBOFactory.getBizObjectManager(LB_CARDATA_SERIES.CLASS_NAME, tx); BizObjectManager bm3 = JBOFactory.getBizObjectManager(LB_CARDATA_MODEL.CLASS_NAME, tx); - //url未知 - /*String url = "http://api.che300.com/service/getCarModelList?token=8192047c7ab1a654eda8fbce470062f0&seriesId="; - String responseResult = VehicleAppraisementUtil.getResponseResult(url);*/ - String filePath = "D://che300yasuo.txt"; - //String readFile = ReadJSON.ReadFile(filePath); - JSONObject object = JSONObject.parseObject("此处待接口通了之后再导入接口返回的JSON字符串"); + BizObjectManager bm4 = JBOFactory.getBizObjectManager(LB_CARDATA_VERSION.CLASS_NAME, tx); + //接口url中的fromVersion参数 + String fromVersion = null; + //开关，作用是若判断为第一次调用接口，保存版本信息到Version表，而不是第一次调用时则将这个值变为true，则更新版本表 + boolean versionflag = false; + //查询二手车版本表,若为空则说明是第一次调用二手车车型库接口 + BizObject versionResult = bm4.createQuery("select O.currentversion,O.initialversion from O").getSingleResult(false); + if(versionResult == null){ + fromVersion = InitSecondHandCarConfig.VERSION; + }else{ + fromVersion = versionResult.getAttribute("currentversion").toString(); + versionflag = true; + } + String url = "http://"+InitSecondHandCarConfig.PREFIX+".che300.com/service/common/eval?fromVersion=" + +fromVersion+"&token="+InitSecondHandCarConfig.TOKEN+""; + String responseResult = VehicleAppraisementUtil.getResponseResult(url); + + //使用fastjson解析接口返回的json数据 + JSONObject object = JSONObject.parseObject(responseResult); JSONObject dataObject = (JSONObject) object.get("data"); @SuppressWarnings("rawtypes") List brandList = JSON.parseArray(JSON.toJSONString(dataObject.get("brand")), HashMap.class); @@ -47,146 +66,145 @@ public class QueryVehicleModeListAction implements Job{ List versionList = JSON.parseArray(JSON.toJSONString(dataObject.get("version")), HashMap.class); @SuppressWarnings("unchecked") Map map = versionList.get(0); - for(int i=0;i Date: Sat, 16 Jun 2018 10:19:27 +0800 Subject: [PATCH 19/21] =?UTF-8?q?=E4=BA=8C=E6=89=8B=E8=BD=A6properties?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/second_handCar.properties | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 config/second_handCar.properties diff --git a/config/second_handCar.properties b/config/second_handCar.properties new file mode 100644 index 000000000..cdd337910 --- /dev/null +++ b/config/second_handCar.properties @@ -0,0 +1,14 @@ +#che300 prefix +com.tenwa.zhanglei.prefix=testapi + +#che300 token +#test environment +com.tenwa.zhanglei.token=a6b83424b55410c36415178002f8415e +#formal environment +#com.tenwa.zhanglei.token=0685c8275534d8d391cdaa5a5cf48c73 + +#che300 operationType +com.tenwa.zhanglei.oper=exportModel + +#che300 initiallversion +com.tenwa.zhanglei.version=3.4.548 \ No newline at end of file From 816cfad21f2ba2c54eb72535e5c898b6e8928737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A3=8A?= <寮犵@LAPTOP-O3DO03BA> Date: Sat, 16 Jun 2018 10:49:05 +0800 Subject: [PATCH 20/21] =?UTF-8?q?=E4=BA=8C=E6=89=8B=E8=BD=A6=E8=BD=A6?= =?UTF-8?q?=E5=9E=8B=E5=BA=93=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quartzmession/QueryVehicleModeListAction.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/QueryVehicleModeListAction.java b/src_tenwa/com/tenwa/lease/app/quartzmession/QueryVehicleModeListAction.java index 18ab75f86..bc99a5ff1 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/QueryVehicleModeListAction.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/QueryVehicleModeListAction.java @@ -37,14 +37,14 @@ public class QueryVehicleModeListAction implements Job{ //接口url中的fromVersion参数 String fromVersion = null; //开关，作用是若判断为第一次调用接口，保存版本信息到Version表，而不是第一次调用时则将这个值变为true，则更新版本表 - boolean versionflag = false; + boolean versionflag = true; //查询二手车版本表,若为空则说明是第一次调用二手车车型库接口 BizObject versionResult = bm4.createQuery("select O.currentversion,O.initialversion from O").getSingleResult(false); if(versionResult == null){ + versionflag = false; fromVersion = InitSecondHandCarConfig.VERSION; }else{ fromVersion = versionResult.getAttribute("currentversion").toString(); - versionflag = true; } String url = "http://"+InitSecondHandCarConfig.PREFIX+".che300.com/service/common/eval?fromVersion=" +fromVersion+"&token="+InitSecondHandCarConfig.TOKEN+""; @@ -201,10 +201,11 @@ public class QueryVehicleModeListAction implements Job{ versionObject.setAttributeValue("currentversion",map.get("CurrentVersion").toString()); versionObject.setAttributeValue("initialversion",map.get("InitialVersion").toString()); bm4.saveObject(versionObject); - } - bm4.createQuery("update O set currentversion=:CURRENTVERSION,initialversion=:INITIALVERSION") - .setParameter("CURRENTVERSION",map.get("CurrentVersion").toString()) - .setParameter("INITIALVERSION",map.get("InitialVersion").toString()).executeUpdate(); + }else{ + bm4.createQuery("update O set currentversion=:CURRENTVERSION,initialversion=:INITIALVERSION") + .setParameter("CURRENTVERSION",map.get("CurrentVersion").toString()) + .setParameter("INITIALVERSION",map.get("InitialVersion").toString()).executeUpdate(); + } } catch (Exception e) { try { if(null != tx){ From fb06ecc2730c48a968dc29d16ea4219288fec9d0 Mon Sep 17 00:00:00 2001 From: amarsoft Date: Sat, 16 Jun 2018 11:48:07 +0800 Subject: [PATCH 21/21] =?UTF-8?q?=E4=BA=A7=E5=93=81=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LmDistributorToproductList.jsp | 14 +++--- .../LmProductDistributorCar.jsp | 38 ++++++++-------- .../LmProductDistributorList.jsp | 43 +++++++++++++------ .../apzl/saveunioncar/saveUnionCarUtil.java | 24 +++++------ 4 files changed, 68 insertions(+), 51 deletions(-) diff --git a/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp b/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp index 673b40444..98127eee0 100644 --- a/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp +++ b/WebContent/Tenwa/Apzl/PortalToCarType/LmDistributorToproductList.jsp @@ -7,11 +7,11 @@ */ ASObjectModel doTemp = new ASObjectModel("LM_DISTRIBUTOR_TO_PRODUCT"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); - String distributorId = CurPage.getParameter("DISTRIBUTOR_ID"); + String typeno = CurPage.getParameter("TYPENO"); dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "1"; //只读模式 dwTemp.setPageSize(10); - dwTemp.genHTMLObjectWindow(distributorId); + dwTemp.genHTMLObjectWindow(typeno); //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 String sButtons[][] = { {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, @@ -20,17 +20,15 @@ }; %><%@include file="/Frame/resources/include/ui/include_list.jspf"%> +<%@ page contentType="text/html; charset=GBK"%><%@ + include file="/IncludeBegin.jsp"%><% +/* + 页面说明: 示例上下联动框架页面 + */ + String TYPENO = CurPage.getParameter("TYPENO"); +%><%@include file="/Resources/CodeParts/Frame02.jsp"%> + <%@ include file="/IncludeEnd.jsp"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorList.jsp b/WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorList.jsp index 30d045714..d156f3d2e 100644 --- a/WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorList.jsp +++ b/WebContent/Tenwa/Apzl/PortalToCarType/LmProductDistributorList.jsp @@ -5,36 +5,55 @@ Content: History Log: */ - ASObjectModel doTemp = new ASObjectModel("LM_DISTRIBUTOR_LIST"); - ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + String PG_TITLE ="汽车产品列表"; + String TYPENO= CurPage.getParameter("TYPENO"); + ASObjectModel doTemp = new ASObjectModel("LmProductCarList"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "1"; //只读模式 dwTemp.setPageSize(10); - dwTemp.genHTMLObjectWindow(""); + dwTemp.genHTMLObjectWindow(TYPENO); //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 String sButtons[][] = { - {"false","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, - {"false","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, - {"false","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, + //{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + //{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, + //{"true","","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/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java b/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java index 1fe991c84..f1f0bc286 100644 --- a/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java +++ b/src_tenwa/com/tenwa/apzl/saveunioncar/saveUnionCarUtil.java @@ -132,25 +132,25 @@ public String getCarBrandId() { String updateUserID = params[0]; String updateOrgId = params[1]; String updateTime = params[2]; - String distributorId = params[3]; - String productid=params[4]; + String typeno = params[3]; + //String productid=params[4]; int lle=0; - BizObjectManager Lmcheck = JBOFactory.getBizObjectManager(LM_DISTRIBUTOR_TO_PRODUCT.CLASS_NAME,tx); - BizObject obcheck=Lmcheck.createQuery("DISTRIBUTOR_ID=:DISTRIBUTOR_ID and PRODUCT_ID=:PRODUCT_ID") - .setParameter("DISTRIBUTOR_ID", distributorId).setParameter("PRODUCT_ID",productid).getSingleResult(false); - if(obcheck!=null){ - return "error"; - } int i; try{ - for(i=4;i