diff --git a/网站项目/VRS/Handler/Config.ashx.cs b/网站项目/VRS/Handler/Config.ashx.cs
index d89fe99..7f03312 100644
--- a/网站项目/VRS/Handler/Config.ashx.cs
+++ b/网站项目/VRS/Handler/Config.ashx.cs
@@ -171,7 +171,8 @@ namespace VRS.Handler
var score = context.Request.Params["score"];
DateTime dt = DateTime.Now;
- var config = bll_exam_result_match_record.GetModelList(string.Format(" user_id = '{0}' and start_time<'{1}' and expire_time>'{1}' ", user_id, dt)).FirstOrDefault();
+ //var config = bll_exam_result_match_record.GetModelList(string.Format(" user_id = '{0}' and start_time<'{1}' and expire_time>'{1}' ", user_id, dt)).FirstOrDefault();
+ var config = bll_exam_result_match_record.GetModelList(string.Format(" user_id = '{0}' ", user_id)).FirstOrDefault();
var obj = new DataService.Model.breakpoint_continuation();
obj.id = BasePage.GetId();
@@ -201,10 +202,10 @@ namespace VRS.Handler
}
///
- /// 比赛是否失效
+ /// 比赛是否失效 init 初始
///
///
- private void MatchRecord(HttpContext context)
+ private void MatchRecord_old(HttpContext context)
{
var ret = string.Empty;
DateTime dt = DateTime.Now;
@@ -287,6 +288,186 @@ namespace VRS.Handler
}
}
+ ///
+ /// 比赛是否失效 微调版
+ ///
+ ///
+ private void MatchRecord(HttpContext context)
+ {
+ var ret = string.Empty;
+ DateTime dt = DateTime.Now;
+ //string sql = string.Format(" 1=1 and start_time<'{0}' and expire_time>'{0}' ", dt);
+ //string sql = string.Format(" 1=1 and start_time<'{0}' ", dt);
+ string sql = string.Format(" 1=1 ");
+ string sql2 = " 1=1 ";
+ var user_id = context.Request.Params["user_id"];
+ if (string.IsNullOrEmpty(user_id))
+ {
+ ret = GetResult(false, "user_id参数不能为空");
+ context.Response.Write(ret);
+ context.Response.End();
+ }
+ else
+ {
+ sql += string.Format(" and user_id='{0}' ", user_id);
+ }
+ var type = context.Request.Params["type"];
+ if (string.IsNullOrEmpty(type))
+ {
+ //ret = GetResult(false, "type参数不能为空");
+ //context.Response.Write(ret);
+ //context.Response.End();
+ }
+ else
+ {
+ sql2 += string.Format(" and type='{0}' ", type);
+ }
+ var step = context.Request.Params["step"];
+ if (string.IsNullOrEmpty(step))
+ {
+ //ret = GetResult(false, "step参数不能为空");
+ //context.Response.Write(ret);
+ //context.Response.End();
+ }
+ else
+ {
+ sql2 += string.Format(" and step='{0}' ", step);
+ }
+
+
+ var device_id = context.Request.Params["device_id"];
+ if (!string.IsNullOrEmpty(device_id))
+ {
+ sql2 += string.Format(" and device_id='{0}' ", device_id);
+ }
+
+ var config = bll_exam_result_match_record.GetModelList(sql).FirstOrDefault();
+ if (null != config)
+ {
+ sql2 += string.Format(" and user_id = '{0}' and record_id='{1}' order by record_time desc ", user_id, config.id);
+ List break_list = new List();
+
+ break_list = bll_breakpoint_continuation.GetModelList(sql2);
+ if (break_list.Count > 0)
+ {
+ var result = GetResult(true, break_list.Select(x => x.data).FirstOrDefault(), "true");
+ context.Response.Write(result);
+ context.Response.End();
+ }
+ else
+ {
+ var result = GetResult(true, "", "false");
+ context.Response.Write(result);
+ context.Response.End();
+ }
+ }
+ else
+ {
+ var datetime = DateTime.Now;
+ var obj = new DataService.Model.exam_result_match_record();
+ obj.id = BasePage.GetId();
+ obj.user_id = user_id;
+ obj.start_time = datetime;
+ //obj.expire_time = datetime.AddDays(1);
+ obj.expire_time = DateTime.MaxValue;
+ bool add_flag = bll_exam_result_match_record.Add(obj);
+
+ var result = GetResult(true, "", "false");
+ context.Response.Write(result);
+ context.Response.End();
+ }
+ }
+
+ ///
+ /// 比赛是否失效
+ ///
+ ///
+ private void MatchRecord_1(HttpContext context)
+ {
+ var ret = string.Empty;
+ DateTime dt = DateTime.Now;
+ string sql = string.Format(" 1=1 ");
+ string sql2 = " 1=1 ";
+ var user_id = context.Request.Params["user_id"];
+ if (string.IsNullOrEmpty(user_id))
+ {
+ ret = GetResult(false, "user_id参数不能为空");
+ context.Response.Write(ret);
+ context.Response.End();
+ }
+ else
+ {
+ sql += string.Format(" and user_id='{0}' ", user_id);
+ }
+ var type = context.Request.Params["type"];
+ if (string.IsNullOrEmpty(type))
+ {
+ //ret = GetResult(false, "type参数不能为空");
+ //context.Response.Write(ret);
+ //context.Response.End();
+ }
+ else
+ {
+ sql2 += string.Format(" and type='{0}' ", type);
+ }
+ var step = context.Request.Params["step"];
+ if (string.IsNullOrEmpty(step))
+ {
+ //ret = GetResult(false, "step参数不能为空");
+ //context.Response.Write(ret);
+ //context.Response.End();
+ }
+ else
+ {
+ sql2 += string.Format(" and step='{0}' ", step);
+ }
+
+
+ var device_id = context.Request.Params["device_id"];
+ if (!string.IsNullOrEmpty(device_id))
+ {
+ sql2 += string.Format(" and device_id='{0}' ", device_id);
+ }
+
+ //var config = bll_exam_result_match_record.GetModelList(sql).FirstOrDefault();
+ if (true)
+ {
+ //sql2 += string.Format(" and user_id = '{0}' and record_id='{1}' order by record_time desc ", user_id, config.id);
+ sql2 += string.Format(" and user_id = '{0}' order by record_time desc ", user_id);
+ List break_list = new List();
+
+ break_list = bll_breakpoint_continuation.GetModelList(sql2);
+ if (break_list.Count > 0)
+ {
+ var result = GetResult(true, break_list.Select(x => x.data).FirstOrDefault(), "true");
+ //var temp = break_list.FirstOrDefault();
+ //var result = GetResult(true, temp.data, "true");
+ context.Response.Write(result);
+ context.Response.End();
+ }
+ else
+ {
+ var result = GetResult(true, "", "false");
+ context.Response.Write(result);
+ context.Response.End();
+ }
+ }
+ else
+ {
+ var datetime = DateTime.Now;
+ var obj = new DataService.Model.exam_result_match_record();
+ obj.id = BasePage.GetId();
+ obj.user_id = user_id;
+ obj.start_time = datetime;
+ obj.expire_time = datetime.AddDays(1);
+ bool add_flag = bll_exam_result_match_record.Add(obj);
+
+ var result = GetResult(true, "", "false");
+ context.Response.Write(result);
+ context.Response.End();
+ }
+ }
+
///
/// 断点查询
///
diff --git a/网站项目/VRS/Management/Home.aspx b/网站项目/VRS/Management/Home.aspx
index a7afcbe..cd35530 100644
--- a/网站项目/VRS/Management/Home.aspx
+++ b/网站项目/VRS/Management/Home.aspx
@@ -50,19 +50,19 @@
成绩查询
<%--竞赛考核 --%>
-
- 竞赛考核
-
-
+
+ 竞赛考核
+
+
考试管理
diff --git a/网站项目/VRS/Model/Achievement.cs b/网站项目/VRS/Model/Achievement.cs
index dd94858..0882473 100644
--- a/网站项目/VRS/Model/Achievement.cs
+++ b/网站项目/VRS/Model/Achievement.cs
@@ -168,6 +168,10 @@ public class CHGYWGYx
public string cjdpz_dxsx { get; set; }
public string cjdpz_scms { get; set; }
+ ///
+ /// 2025-02-28 added
+ ///
+ //public string mqtt_qiyong { get; set; }
public string mqtt_ip { get; set; }
public string mqtt_wgsn { get; set; }
@@ -223,6 +227,10 @@ public class CHGYWGWx
public string cjdpz_dxsx { get; set; }
public string cjdpz_scms { get; set; }
+ ///
+ /// 2025-02-28 added
+ ///
+ //public string mqtt_qiyong { get; set; }
public string mqtt_ip { get; set; }
public string mqtt_wgsn { get; set; }
diff --git a/网站项目/VRS/VRS.csproj b/网站项目/VRS/VRS.csproj
index 8b06849..2fbf966 100644
--- a/网站项目/VRS/VRS.csproj
+++ b/网站项目/VRS/VRS.csproj
@@ -2321,7 +2321,7 @@
True
52524
/
- http://localhost:53000/
+ http://localhost:53088/
False
False