From 02fe59564a19996974a9d36be6ab61f29ee4c004 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期三, 02 十一月 2022 17:06:36 +0800
Subject: [PATCH] 修复好几个bug
---
web/Dao/GwAuditCacheDao.cs | 15 ++++
web/Lib/Dao.dll | 0
web/web/Bin/Dao.dll | 0
web/Dao/GwSpDao.cs | 101 ---------------------------------
web/.vs/Web/v16/.suo | 0
web/web/GwSp.ashx | 6 +-
web/web/gwspupdate.aspx | 10 ++-
web/Lib/Dao.pdb | 0
web/web/Bin/Dao.pdb | 0
9 files changed, 22 insertions(+), 110 deletions(-)
diff --git a/web/.vs/Web/v16/.suo b/web/.vs/Web/v16/.suo
index d8084a0..81c20b4 100644
--- a/web/.vs/Web/v16/.suo
+++ b/web/.vs/Web/v16/.suo
Binary files differ
diff --git a/web/Dao/GwAuditCacheDao.cs b/web/Dao/GwAuditCacheDao.cs
index b012f24..5f16a45 100644
--- a/web/Dao/GwAuditCacheDao.cs
+++ b/web/Dao/GwAuditCacheDao.cs
@@ -95,8 +95,19 @@
{
string OP = "";
if (opname != "")
- OP = $"and op.OP_NAME='{opname}'";
- string str = string.Format("SELECT op.op_name,ca.SP_ID,ca.OP_ID,ca.MSG_CONTENT,ca.KEYWORD,ca.HASH_CODE,COUNT(*) CNT FROM GW_AUDIT_CACHE ca left join gw_op op on ca.op_id=op.op_id WHERE {0} ca.AP_SUBMIT_TIME BETWEEN :START_TIME AND :END_TIME AND (ca.MSG_CONTENT LIKE :CONTENT OR :CONTENT='%%') AND ca.AUDITING_STATUS=:AUDITING_STATUS {1} \r\n GROUP BY ca.SP_ID,ca.OP_ID,ca.MSG_CONTENT,ca.KEYWORD,ca.HASH_CODE,op.op_name", this.GenerateOpIDsString(spids), OP);
+ { OP = $"and op.OP_NAME='{opname}'"; }
+ //string str = string.Format("SELECT op.op_name,ca.SP_ID,ca.OP_ID,ca.MSG_CONTENT,ca.KEYWORD,ca.HASH_CODE,COUNT(*) CNT " +
+ // "FROM GW_AUDIT_CACHE ca left join gw_op op on ca.op_id=op.op_id WHERE " +
+ // " {0} ca.AP_SUBMIT_TIME BETWEEN :START_TIME AND :END_TIME AND (ca.MSG_CONTENT LIKE :CONTENT OR :CONTENT='%%')" +
+ // " AND ca.AUDITING_STATUS=:AUDITING_STATUS {1} \r\n " +
+ // " GROUP BY ca.SP_ID,ca.OP_ID,ca.MSG_CONTENT,ca.KEYWORD,ca.HASH_CODE,op.op_name", this.GenerateOpIDsString(spids), OP);
+ //鏈�鏂�
+ string str = string.Format("SELECT op.op_name,ca.SP_ID,ca.OP_ID,ca.MSG_CONTENT,ca.KEYWORD,ca.HASH_CODE,COUNT(*) CNT " +
+ "FROM GW_AUDIT_CACHE ca left join gw_op op on ca.op_id=op.op_id WHERE " +
+ " ca.SP_ID IN '{0}' and ca.AP_SUBMIT_TIME BETWEEN :START_TIME AND :END_TIME AND (ca.MSG_CONTENT LIKE :CONTENT OR :CONTENT='%%')" +
+ " AND ca.AUDITING_STATUS=:AUDITING_STATUS {1} \r\n " +
+ " GROUP BY ca.SP_ID,ca.OP_ID,ca.MSG_CONTENT,ca.KEYWORD,ca.HASH_CODE,op.op_name",spids, OP);
+
List<GwAuditCache> list = new List<GwAuditCache>();
OracleParameter[] parameterArray = new OracleParameter[] { new OracleParameter(":START_TIME", begin), new OracleParameter(":END_TIME", end), new OracleParameter(":CONTENT", "%" + content + "%"), new OracleParameter(":AUDITING_STATUS", status) };
recordCount = Convert.ToInt32(OracleHelper.ExecuteScalar(OracleHelper.ToCountSql(str), OracleHelper.Connection, parameterArray));
diff --git a/web/Dao/GwSpDao.cs b/web/Dao/GwSpDao.cs
index bb059f0..3c3843a 100644
--- a/web/Dao/GwSpDao.cs
+++ b/web/Dao/GwSpDao.cs
@@ -355,107 +355,6 @@
public bool Update(GwSp o)
{
- /**
- StringBuilder stringBuilder = new StringBuilder();
- stringBuilder.Append("UPDATE GW_SP SET ");
- stringBuilder.Append(" AP_ID=:APID, COMBINATION_MODE=:COMBINATION_MODE,CLIENT_ID=:CLIENTID,STRATEGY_ID=:STRATEGYID,PASSWORD=:PASSWORD ");
- stringBuilder.Append(" , CLIENT_IP=:CLIENTIP,CLIENT_PORT=:CLIENTPORT,ACCESS_CODE=:ACCESSCODE ");
- stringBuilder.Append(" , PRIORITY=:PRIORITY,PRICE=:PRICE,CHARGE_TYPE=:CHARGETYPE ");
- stringBuilder.Append(" , THRESHOLD=:THRESHOLD,MAX_CONN_COUNT=:MAXCONNCOUNT,REMARK=:REMARK ");
- stringBuilder.Append(" , TIME_PERMITTING=:TIME_PERMITTING,AUDITING_MODE=:AUDITINGMODE ");
- stringBuilder.Append(" , DEDUCT_PERCENT=:DEDUCTPERCENT ");
- stringBuilder.Append(" , CM_OP_ID=:CM_OP_ID,CT_OP_ID=:CT_OP_ID,UN_OP_ID=:UN_OP_ID ");
- stringBuilder.Append(" , DEFISHING_TIMEOUT = :DEFISHING_TIMEOUT,DEFISHING_THRESHOLD =:DEFISHING_THRESHOLD ");
- stringBuilder.Append(" , REJECT_IF_FORBIDDEN =:REJECT_IF_FORBIDDEN ");
- stringBuilder.Append(" , REFUND_IF_UNDELIVERED =:REFUND_IF_UNDELIVERED ");
- stringBuilder.Append(" , ROUTER_TYPE=:ROUTER_TYPE,STATUS=:STATUS,ACCESSCODE_MODE=:ACCESSCODE_MODE ");
- stringBuilder.Append(" , EXTNOEXTENSION_MODE=:EXTNOEXTENSION_MODE,DEFISHING_OP_ID =:DEFISHING_OP_ID ");
- stringBuilder.Append(" , MODIFY_TIME=SYSDATE,FEE_SHORT_LENGTH=:FEE_SHORT_LENGTH,FEE_LONG_LENGTH=:FEE_LONG_LENGTH ");
- stringBuilder.Append(" , BLACK_MODE=:BLACK_MODE ");
- stringBuilder.Append(" , DIVERTER_ID=:DIVERTER_ID ");
- stringBuilder.Append(" , MCPM=:MCPM ");
- stringBuilder.Append(" , MC_EXPRESSION=:MC_EXPRESSION ");
- stringBuilder.Append(" , CM_EXT_PARAMS=:CM_EXT_PARAMS ");
- stringBuilder.Append(" , CT_EXT_PARAMS=:CT_EXT_PARAMS ");
- stringBuilder.Append(" , CU_EXT_PARAMS=:CU_EXT_PARAMS ");
- stringBuilder.Append(" , CM_GROUP_ID=:CM_GROUP_ID ");
- stringBuilder.Append(" , CU_GROUP_ID=:CU_GROUP_ID ");
- stringBuilder.Append(" , CT_GROUP_ID=:CT_GROUP_ID ");
- stringBuilder.Append(" , BALANCE_THRESHOLD = :BALANCE_THRESHOLD ");
- stringBuilder.Append(" , ALARM_MOBILE = :ALARM_MOBILE ");
- stringBuilder.Append(" , FORCE_SIGN_FLAG = :FORCE_SIGN_FLAG ");
- stringBuilder.Append(" , FORCE_SIGN = :FORCE_SIGN ");
- stringBuilder.Append(" , SIGNATURE_MODE=:SIGNATURE_MODE ");
- stringBuilder.Append(" , SIGNATURES=:SIGNATURESE ");
- stringBuilder.Append(" , VerCodeMode=:VerCodeMode ");
- stringBuilder.Append(" , ProvincialNetworkMode=:ProvincialNetworkMode ");
- stringBuilder.Append(" , RESEND_STATUS =:RESEND_STATUS ");
- stringBuilder.Append(" , RESEND_CM_GROUPID =:RESEND_CM_GROUPID ");
- stringBuilder.Append(" , RESEND_CU_GROUPID =:RESEND_CU_GROUPID ");
- stringBuilder.Append(" , RESEND_CT_GROUPID =:RESEND_CT_GROUPID ");
- stringBuilder.Append(" , RANSFERFLAG =:TRANSFERFLAG ");
- stringBuilder.Append(" WHERE SP_ID=:SPID" );
-
-
- return OracleHelper.ExecuteSql(stringBuilder.ToString(), OracleHelper.Connection,
- new OracleParameter(":APID", (object)o.ApID),
- new OracleParameter(":COMBINATION_MODE", (object)o.CombinationMode),
- new OracleParameter(":CLIENTID", (object)o.ClientID),
- new OracleParameter(":STRATEGYID", (object)o.StrategyID),
- new OracleParameter(":PASSWORD", (object)o.Password),
- new OracleParameter(":CLIENTIP", (object)o.ClientIp),
- new OracleParameter(":CLIENTPORT", (object)o.ClientPort),
- new OracleParameter(":ACCESSCODE", (object)o.AccessCode),
- new OracleParameter(":PRIORITY", (object)o.Priority),
- new OracleParameter(":PRICE", (object)o.Price),
- new OracleParameter(":CHARGETYPE", (object)o.ChargeType),
- new OracleParameter(":THRESHOLD", (object)o.Threshold),
- new OracleParameter(":MAXCONNCOUNT", (object)o.MaxConnCount),
- new OracleParameter(":REMARK", (object)o.Remark),
- new OracleParameter(":TIME_PERMITTING", (object)o.TimePermitting),
- new OracleParameter(":AUDITINGMODE", (object)o.AuditingMode),
- new OracleParameter(":DEDUCTPERCENT", (object)o.DeductPercent),
- new OracleParameter(":SPID", (object)o.SpID),
- new OracleParameter(":CM_OP_ID", (object)o.CMOPID),
- new OracleParameter(":CT_OP_ID", (object)o.CTOPID),
- new OracleParameter(":UN_OP_ID", (object)o.UNOPID),
- new OracleParameter(":DEFISHING_TIMEOUT", (object)o.DefishingTimeout),
- new OracleParameter(":DEFISHING_THRESHOLD", (object)o.DefishingThreshold),
- new OracleParameter(":REJECT_IF_FORBIDDEN", (object)o.RejectIfForbidden),
- new OracleParameter(":REFUND_IF_UNDELIVERED", (object)o.RefundIfUndelivered),
- new OracleParameter(":STATUS", (object)o.Status),
- new OracleParameter(":ACCESSCODE_MODE", (object)o.AccessCodeMode),
- new OracleParameter(":EXTNOEXTENSION_MODE", (object)o.ExtnoExtensionMode),
- new OracleParameter(":DEFISHING_OP_ID", (object)o.DefishingOPID),
- new OracleParameter(":ROUTER_TYPE", (object)o.RouterType),
- new OracleParameter(":CM_EXT_PARAMS", (object)o.CMextparms),
- new OracleParameter(":CT_EXT_PARAMS", (object)o.CTextparams),
- new OracleParameter(":CU_EXT_PARAMS", (object)o.CUextparams),
- new OracleParameter(":FEE_SHORT_LENGTH", (object)o.FeeShortLength),
- new OracleParameter(":FEE_LONG_LENGTH", (object)o.FeeLongLength),
- new OracleParameter(":BLACK_MODE", (object)o.BlackMode),
- new OracleParameter(":DIVERTER_ID", (object)o.DiverterID),
- new OracleParameter(":MCPM", (object)o.MCPM),
- new OracleParameter(":MC_EXPRESSION", (object)o.McExpression),
- new OracleParameter(":CM_GROUP_ID", (object)o.CMGroupID),
- new OracleParameter(":CU_GROUP_ID", (object)o.CUGroupID),
- new OracleParameter(":CT_GROUP_ID", (object)o.CTGroupID),
- new OracleParameter(":BALANCE_THRESHOLD", (object)o.BalanceThreshold),
- new OracleParameter(":ALARM_MOBILE", (object)o.AlarmMobile),
- new OracleParameter(":FORCE_SIGN_FLAG", (object)o.ForceSignFlag),
- new OracleParameter(":FORCE_SIGN", (object)o.ForceSign),
- new OracleParameter(":SIGNATURE_MODE", (object)o.SignatureMode),
- new OracleParameter(":SIGNATURES", (object)o.Signatures),
- new OracleParameter(":VerCodeMode", (object)o.VerCodeMode),
- new OracleParameter(":ProvincialNetworkMode",(object)o.ProvincialNetworkMode),
- new OracleParameter(":RESEND_STATUS", (object)o.RESEND_STATUS),
- new OracleParameter(":RESEND_CM_GROUPID", (object)o.RESEND_CM_GROUPID),
- new OracleParameter(":RESEND_CU_GROUPID", (object)o.RESEND_CU_GROUPID),
- new OracleParameter(":RESEND_CT_GROUPID",(object)o.RESEND_CT_GROUPID),
- new OracleParameter(":TRANSFERFLAG",(object)o.TransferFlag)
- ) > 0;
- **/
-
return OracleHelper.ExecuteSql("UPDATE GW_SP SET AP_ID=:APID,COMBINATION_MODE=:COMBINATION_MODE,CLIENT_ID=:CLIENTID," +
"STRATEGY_ID=:STRATEGYID,PASSWORD=:PASSWORD,\r\nCLIENT_IP=:CLIENTIP,CLIENT_PORT=:CLIENTPORT," +
"ACCESS_CODE=:ACCESSCODE,\r\nPRIORITY=:PRIORITY,PRICE=:PRICE,CHARGE_TYPE=:CHARGETYPE," +
diff --git a/web/Lib/Dao.dll b/web/Lib/Dao.dll
index 808c9f3..5d3a1f1 100644
--- a/web/Lib/Dao.dll
+++ b/web/Lib/Dao.dll
Binary files differ
diff --git a/web/Lib/Dao.pdb b/web/Lib/Dao.pdb
index 7b2b46c..a9fb8e4 100644
--- a/web/Lib/Dao.pdb
+++ b/web/Lib/Dao.pdb
Binary files differ
diff --git a/web/web/Bin/Dao.dll b/web/web/Bin/Dao.dll
index 808c9f3..5d3a1f1 100644
--- a/web/web/Bin/Dao.dll
+++ b/web/web/Bin/Dao.dll
Binary files differ
diff --git a/web/web/Bin/Dao.pdb b/web/web/Bin/Dao.pdb
index 7b2b46c..a9fb8e4 100644
--- a/web/web/Bin/Dao.pdb
+++ b/web/web/Bin/Dao.pdb
Binary files differ
diff --git a/web/web/GwSp.ashx b/web/web/GwSp.ashx
index f9a0b2e..94d6dc6 100644
--- a/web/web/GwSp.ashx
+++ b/web/web/GwSp.ashx
@@ -593,7 +593,7 @@
o.AccessCode = context.GetString("AccessCode");
o.Priority = context.GetInt("Priority", 0);
o.Price = Math.Max((int)(context.GetDecimal("Price", new Decimal(4, 0, 0, false, (byte)2)) * new Decimal(1000)), 1);
- //o.ChargeType = context.GetInt("ChargeType", 0);
+ o.ChargeType = context.GetInt("ChargeType", 0);
o.IsAutoReturn = context.GetInt("IsAutoReturn", 0);
o.Threshold = Math.Max(context.GetInt("Threshold", 10), 10);
o.MaxConnCount = context.GetInt("MaxConnCount", 1);
@@ -733,7 +733,7 @@
o.AccessCode = context.GetString("AccessCode");
o.Priority = context.GetInt("Priority", 0);
o.Price = Math.Max((int)(context.GetDecimal("Price", new Decimal(4, 0, 0, false, (byte)2)) * new Decimal(1000)), 1);
- //o.ChargeType = context.GetInt("ChargeType", 0);
+ o.ChargeType = context.GetInt("ChargeType", 0);
o.IsAutoReturn = context.GetInt("IsAutoReturn", 0);
o.Threshold = Math.Max(context.GetInt("Threshold", 10), 10);
o.MaxConnCount = context.GetInt("MaxConnCount", 1);
@@ -893,7 +893,7 @@
int cuGroupId = context.GetInt("cuGroupID");
int ctGroupId = context.GetInt("ctGroupID");
- if (cmOpId == 0 || cuOpId == 0 || ctOpId == 0||cmGroupId ==0 ||cuGroupId==0||ctGroupId==0)
+ if (cmOpId == 0 && cuOpId == 0 && ctOpId == 0 && cmGroupId ==0 && cuGroupId==0 &&ctGroupId==0)
{
throw new ArgumentException("閫夐」涓嶅厑璁稿叏閮ㄤ负绌猴紝璇疯嚦灏戦�夋嫨涓�椤癸紒");
}
diff --git a/web/web/gwspupdate.aspx b/web/web/gwspupdate.aspx
index 4ca7ca9..36ae177 100644
--- a/web/web/gwspupdate.aspx
+++ b/web/web/gwspupdate.aspx
@@ -784,20 +784,22 @@
value="<%=GwSp.Threshold%>" onkeyup="value=value.replace(/[^\d]/g,'')" onpaste="value=value.replace(/[^\d]/g,'')"
oncontextmenu="return false" />鏉�/姣忕 <span class="highlight">*</span>
</td>
- <!--
+ </tr>
+ <tr>
+
<th>
浠樿垂鏂瑰紡:
</th>
<td>
<select name="ChargeType" id="ChargeType">
- <option value="1" <--%if(GwSp.ChargeType==1){ %>selected<--%} %>>棰勪粯璐�</option>
- <option value="2" <--%if(GwSp.ChargeType==2){ %>selected<--%} %>>鍚庝粯璐�</option>
+ <option value="1" <%if(GwSp.ChargeType==1){ %>selected<%} %>>棰勪粯璐�</option>
+ <option value="2" <%if(GwSp.ChargeType==2){ %>selected<%} %>>鍚庝粯璐�</option>
</select>
<span class="highlight">*</span>
</td>
- -->
+
<th>
鏄惁鑷姩杩旇繕:
</th>
--
Gitblit v1.9.1