From 327cc29cbf34f6e148d1655efe2d7c44913cdaa4 Mon Sep 17 00:00:00 2001
From: xinyb_ <xin0322>
Date: 星期五, 05 十一月 2021 08:51:27 +0800
Subject: [PATCH] 数据源配置界面添加多三个字段控件
---
WebRoot/shopping/maintaince/systemconfig.jsp | 20 +++++++++
src/com/yc/entity/DataSourceEntity.java | 33 +++++++++++++++-
src/com/yc/service/demo/DemoImpl.java | 26 ++++++++----
WebRoot/demo/update1.jsp | 20 +++++++++
4 files changed, 85 insertions(+), 14 deletions(-)
diff --git a/WebRoot/demo/update1.jsp b/WebRoot/demo/update1.jsp
index 40c173a..ef3c8d3 100644
--- a/WebRoot/demo/update1.jsp
+++ b/WebRoot/demo/update1.jsp
@@ -216,7 +216,7 @@
<div class="layui-form-item">
<label class="layui-form-label">鏀粯鏂瑰紡</label>
<div class="layui-input-block">
- <select name="PaymentMethod" lay-filter="pay">
+ <select name="paymentMethod" lay-filter="pay">
<option value=""> </option>
<option value="PaymentOnlineForABC">姹熻嫃鍐滆e鏀舵</option>
<option value="QuickPaymentForABC">鍏ㄥ浗鍐滆鍟嗘槗浠�</option>
@@ -224,6 +224,24 @@
</select>
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">姹熻嫃鍐滆e鏀舵cKey</label>
+ <div class="layui-input-block">
+ <input type="text" name="abcKey" value="" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">姹熻嫃鍐滆e鏀舵cKey16</label>
+ <div class="layui-input-block">
+ <input type="text" name="abcKey16" value="" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">姹熻嫃鍐滆e鏀舵sendsite</label>
+ <div class="layui-input-block">
+ <input type="text" name="abcSendSite" value="" autocomplete="off" class="layui-input">
+ </div>
+ </div>
<fieldset class="layui-elem-field layui-field-title">
<legend>鍏朵粬閫夐」</legend>
</fieldset>
diff --git a/WebRoot/shopping/maintaince/systemconfig.jsp b/WebRoot/shopping/maintaince/systemconfig.jsp
index 0decc95..1b991d6 100644
--- a/WebRoot/shopping/maintaince/systemconfig.jsp
+++ b/WebRoot/shopping/maintaince/systemconfig.jsp
@@ -157,7 +157,7 @@
<div class="layui-form-item">
<label class="layui-form-label">鏀粯鏂瑰紡</label>
<div class="layui-input-block">
- <select name="PaymentMethod" lay-filter="pay">
+ <select name="paymentMethod" lay-filter="pay">
<option value=""> </option>
<option value="PaymentOnlineForABC">姹熻嫃鍐滆e鏀舵</option>
<option value="QuickPaymentForABC">鍏ㄥ浗鍐滆鍟嗘槗浠�</option>
@@ -165,6 +165,24 @@
</select>
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">姹熻嫃鍐滆e鏀舵cKey</label>
+ <div class="layui-input-block">
+ <input type="text" name="abcKey" value="" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">姹熻嫃鍐滆e鏀舵cKey16</label>
+ <div class="layui-input-block">
+ <input type="text" name="abcKey16" value="" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">姹熻嫃鍐滆e鏀舵sendsite</label>
+ <div class="layui-input-block">
+ <input type="text" name="abcSendSite" value="" autocomplete="off" class="layui-input">
+ </div>
+ </div>
<fieldset class="layui-elem-field layui-field-title">
<legend>鍩虹璁剧疆2</legend>
</fieldset>
diff --git a/src/com/yc/entity/DataSourceEntity.java b/src/com/yc/entity/DataSourceEntity.java
index 7e51dc5..f3d1bbb 100644
--- a/src/com/yc/entity/DataSourceEntity.java
+++ b/src/com/yc/entity/DataSourceEntity.java
@@ -70,14 +70,41 @@
private boolean isAutoGenerateFormId = false ; //鏄惁鑷姩鐢熸垚鍔熻兘鍙�
private String tengXunMapLocationServiceKey = null ; //鑵捐浣嶇疆鏈嶅姟鍦板浘閫夌偣
- private String PaymentMethod;//鍦ㄧ嚎鏀粯 xin 2021-10-12 11:29:06
+ private String paymentMethod;//鍦ㄧ嚎鏀粯 xin 2021-10-12 11:29:06
+ private String abcKey; //姹熻嫃鍐滆e鏀舵cKey
+ private String abcKey16;//姹熻嫃鍐滆e鏀舵cKey16
+ private String abcSendSite;//姹熻嫃鍐滆e鏀舵sendsite
public String getPaymentMethod() {
- return PaymentMethod;
+ return paymentMethod;
}
public void setPaymentMethod(String paymentMethod) {
- PaymentMethod = paymentMethod;
+ this.paymentMethod = paymentMethod;
+ }
+
+ public String getAbcKey() {
+ return abcKey;
+ }
+
+ public void setAbcKey(String abcKey) {
+ this.abcKey = abcKey;
+ }
+
+ public String getAbcKey16() {
+ return abcKey16;
+ }
+
+ public void setAbcKey16(String abcKey16) {
+ this.abcKey16 = abcKey16;
+ }
+
+ public String getAbcSendSite() {
+ return abcSendSite;
+ }
+
+ public void setAbcSendSite(String abcSendSite) {
+ this.abcSendSite = abcSendSite;
}
public String getTengXunMapLocationServiceKey() {
diff --git a/src/com/yc/service/demo/DemoImpl.java b/src/com/yc/service/demo/DemoImpl.java
index 6e3c7de..10e9a3b 100644
--- a/src/com/yc/service/demo/DemoImpl.java
+++ b/src/com/yc/service/demo/DemoImpl.java
@@ -35,7 +35,7 @@
+ " a.MpMchId,a.MpMchName,a.MpMchKey,a.isDisabledOpenNextPeriodId,a.InvitationCode,\n"
+ " a.SystemAccessKey,a.SystemSecretKey,a.DockingSystem,a.isUseAPP,a.isShowInLoginPage,\n"
+ " case when a.LogoIcon is null then 0 else 1 end as hasLogoIcon,a.Protocol,a.isAutoGenerateFormId, \n"
- + " a.TengXunMapLocationServiceKey,a.PaymentMethod \n";
+ + " a.TengXunMapLocationServiceKey,a.PaymentMethod,a.AbcKey,a.AbcKey16,a.AbcSendSite \n";
public int getComPanyId(String cltSN) {
@@ -211,6 +211,9 @@
dataSourceEntity.setAutoGenerateFormId(map.get("isAutoGenerateFormId") != null &&map.get("isAutoGenerateFormId").equals(1)?true:false );
dataSourceEntity.setTengXunMapLocationServiceKey(map.get("TengXunMapLocationServiceKey") == null?"": (String)map.get("TengXunMapLocationServiceKey"));
dataSourceEntity.setPaymentMethod(map.get("PaymentMethod") == null?"":(String)map.get("PaymentMethod"));
+ dataSourceEntity.setAbcKey(map.get("AbcKey") == null?"":(String)map.get("AbcKey"));
+ dataSourceEntity.setAbcKey16(map.get("AbcKey16") == null?"":(String)map.get("AbcKey16"));
+ dataSourceEntity.setAbcSendSite(map.get("AbcSendSite") == null?"":(String)map.get("AbcSendSite"));
return dataSourceEntity ;
}
@@ -231,7 +234,7 @@
+ " @MpMchKey varchar(50) = ? , @GeoWebApiKey varchar(200) =? ,@isDisabledOpenNextPeriodId int = ?,@InvitationCode varchar(20) =? , \n"
+ " @SystemAccessKey varchar(150) = ?,@SystemSecretKey varchar(150) = ?,@DockingSystem varchar(50) = ?,@isUseAPP int = ?,\n"
+ " @isShowInLoginPage int = ?, @LogoIcon varbinary(max) = ?,@isAutoGenerateFormId int = ?,@TengXunMapLocationServiceKey varchar(50) = ? ,\n"
- + " @PaymentMethod varchar(50) = ? \n"
+ + " @PaymentMethod varchar(50) = ?,@AbcKey varchar(50) = ?,@AbcKey16 varchar(50) = ?,@AbcSendSite varchar(50) = ? \n"
+ " if isnull(@dbid,0) = 0 \n"
+ " begin \n"
+ " select @dbid = id from gsystem where systemid= @systemID \n"
@@ -255,7 +258,8 @@
+ " isAutoGenerateFormId = @isAutoGenerateFormId,isUseAPP = @isUseAPP \n"
//+ " isShowInLoginPage = @isShowInLoginPage \n"
+ " " + (dataSourceEntity.isHasLogoIcon() ? "" : ",LogoIcon = @LogoIcon") + " \n"
- + " , TengXunMapLocationServiceKey = @TengXunMapLocationServiceKey,PaymentMethod=@PaymentMethod \n"
+ + " , TengXunMapLocationServiceKey = @TengXunMapLocationServiceKey,PaymentMethod=@PaymentMethod " +
+ " , AbcKey=@AbcKey,AbcKey16=@AbcKey16,AbcSendSite=@AbcSendSite \n"
+ " where id= @dbid ; \n"
+ " select @@rowcount ; \n"
+ " return ; \n"
@@ -279,7 +283,8 @@
dataSourceEntity.getGeoWebApiKey(),dataSourceEntity.isDisabledOpenNextPeriodId()?1:0,dataSourceEntity.getInvitationCode(),
dataSourceEntity.getSystemAccessKey(),dataSourceEntity.getSystemSecretKey(),
dataSourceEntity.getDockingSystem(),dataSourceEntity.isUseAPP()?1:0,dataSourceEntity.isShowInLoginPage()?1:0,dataSourceEntity.getLogoIcon(),
- dataSourceEntity.isAutoGenerateFormId()?1:0,dataSourceEntity.getTengXunMapLocationServiceKey(),dataSourceEntity.getPaymentMethod()
+ dataSourceEntity.isAutoGenerateFormId()?1:0,dataSourceEntity.getTengXunMapLocationServiceKey(),dataSourceEntity.getPaymentMethod(),
+ dataSourceEntity.getAbcKey(),dataSourceEntity.getAbcKey16(),dataSourceEntity.getAbcSendSite()
}) ;
return ret ;
@@ -302,7 +307,7 @@
+ " @MpMchKey varchar(50) = ? , @GeoWebApiKey varchar(200) =? ,@isDisabledOpenNextPeriodId int = ?,@InvitationCode varchar(20) =?, \n"
+ " @SystemAccessKey varchar(150) = ?,@SystemSecretKey varchar(150) = ?,@DockingSystem varchar(50) = ?,@isUseAPP int = ?,@isShowInLoginPage int = ?,\n"
+ " @LogoIcon varbinary(max) = ? , @Protocol varchar(20) = ?,@isAutoGenerateFormId int = ?,@TengXunMapLocationServiceKey varchar(50) = ?,\n"
- + " @PaymentMethod varchar(50) = ?\n"
+ + " @PaymentMethod varchar(50) = ?,@AbcKey varchar(50) = ?,@AbcKey16 varchar(50) = ?,@AbcSendSite varchar(50) = ? \n"
+ " if isnull(@dbid,0) = 0 \n"
+ " begin \n"
+ " select @dbid = id from gsystem where systemid= @systemID \n"
@@ -323,7 +328,7 @@
+ " SystemAccessKey = @SystemAccessKey,SystemSecretKey = @SystemSecretKey,DockingSystem = @DockingSystem,isUseAPP = @isUseAPP, \n"
+ " isShowInLoginPage = @isShowInLoginPage,"+(dataSourceEntity.isHasLogoIcon()?"":"LogoIcon = @LogoIcon, ") + "\n"
+ " Protocol = @Protocol,isAutoGenerateFormId = @isAutoGenerateFormId,TengXunMapLocationServiceKey = @TengXunMapLocationServiceKey, \n"
- + " PaymentMethod = @PaymentMethod \n"
+ + " PaymentMethod = @PaymentMethod,AbcKey=@AbcKey,AbcKey16=@AbcKey16,AbcSendSite=@AbcSendSite \n"
+ " where id= @dbid ; \n"
+ " select @dbid ; \n"
+ " end else \n"
@@ -334,14 +339,16 @@
+ " CorpURL,MpAppId,MpSecret,MpToken,MpAesKey,MpOrgId,\n"
+ " MiniAppId,MiniAppSecret,MiniAppToken,MiniAppAesKey,MiniAppOrgId,\n"
+ " MpMchId,MpMchName,MpMchKey,GeoWebApiKey,isDisabledOpenNextPeriodId,InvitationCode,\n"
- + " SystemAccessKey,SystemSecretKey,DockingSystem,isUseAPP,isShowInLoginPage,LogoIcon ,Protocol,isAutoGenerateFormId,TengXunMapLocationServiceKey,PaymentMethod)\n"
+ + " SystemAccessKey,SystemSecretKey,DockingSystem,isUseAPP,isShowInLoginPage,LogoIcon ,Protocol,isAutoGenerateFormId,TengXunMapLocationServiceKey,PaymentMethod," +
+ " AbcKey,AbcKey16,AbcSendSite)\n"
+ " values (@systemID,@systemDescribe,@host,@userid,@password,@db,@port,@actived,@domain,@smsUid,@smsKey, \n"
+ " @isShowAttendanceButton,@LimitUserNumber,@systemType,@expiredDate,@LimitDepartmentNumber, \n"
+ " @Remarks,@DataCheckPageNum,@CorpId,\n"
+ " @CorpURL,@MpAppId,@MpSecret,@MpToken,@MpAesKey,@MpOrgId,\n"
+ " @MiniAppId,@MiniAppSecret,@MiniAppToken,@MiniAppAesKey,@MiniAppOrgId,\n"
+ " @MpMchId,@MpMchName,@MpMchKey,@GeoWebApiKey,@isDisabledOpenNextPeriodId,@InvitationCode, \n"
- + " @SystemAccessKey,@SystemSecretKey,@DockingSystem,@isUseAPP,@isShowInLoginPage,@LogoIcon,@Protocol,@isAutoGenerateFormId,@TengXunMapLocationServiceKey,@PaymentMethod) \n"
+ + " @SystemAccessKey,@SystemSecretKey,@DockingSystem,@isUseAPP,@isShowInLoginPage,@LogoIcon,@Protocol,@isAutoGenerateFormId,@TengXunMapLocationServiceKey,@PaymentMethod," +
+ " @AbcKey,@AbcKey16,@AbcSendSite ) \n"
+ " select @@IDENTITY \n"
+ " end \n";
@@ -364,7 +371,8 @@
dataSourceEntity.getSystemAccessKey(),dataSourceEntity.getSystemSecretKey(),
dataSourceEntity.getDockingSystem(),dataSourceEntity.isUseAPP()?1:0,dataSourceEntity.isShowInLoginPage()?1:0,
dataSourceEntity.getLogoIcon(),dataSourceEntity.getProtocol() ,dataSourceEntity.isAutoGenerateFormId()?1:0,
- dataSourceEntity.getTengXunMapLocationServiceKey(),dataSourceEntity.getPaymentMethod()
+ dataSourceEntity.getTengXunMapLocationServiceKey(),dataSourceEntity.getPaymentMethod(),
+ dataSourceEntity.getAbcKey(),dataSourceEntity.getAbcKey16(),dataSourceEntity.getAbcSendSite()
}) ;
return ret ;
--
Gitblit v1.8.0