Browse Source

Update

master
fanwensheng 3 years ago
parent
commit
bfb37363e2
  1. 2
      04.系统编码/App/App.csproj
  2. 13
      04.系统编码/App/Content/scripts/beijing/realtime-panel.js
  3. 1
      04.系统编码/App/Content/scripts/config.js
  4. 3
      04.系统编码/App/Controllers/BeijingController.cs
  5. 4
      04.系统编码/App/Controllers/PointController.cs
  6. 4
      04.系统编码/BLL/PointBLL.cs
  7. 6
      04.系统编码/DAL/PointDAL.cs
  8. 3
      04.系统编码/Model/Point.cs

2
04.系统编码/App/App.csproj

@ -326,12 +326,14 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
<Folder Include="Content\json\menggu\" />
<Folder Include="Models\" />
</ItemGroup>
<ItemGroup>
<Content Include="Content\scripts\beijing\wind-template.json" />
<Content Include="Content\scripts\menggu\wind-template.json" />
<Content Include="Content\thirds\leaflet.draw-0.4.14\leaflet.draw-src.map" />
<Content Include="Content\json\beijing\202111060851610.json" />
<None Include="packages.config" />
<Content Include="Views\Tiananmen\Index.cshtml" />
<Content Include="Views\User\Login.cshtml" />

13
04.系统编码/App/Content/scripts/beijing/realtime-panel.js

@ -183,7 +183,7 @@
$.ajax({
type: "GET",
dataType: 'json',
url: 'http://{0}/bj/check?num={1}'.format(Config.ApiRoot, this.TaskInfo.Id),
url: this.getJsonUrl(this.TaskInfo.Id),
success: function (result) {
this.TaskInfo.Result = result;
@ -200,6 +200,13 @@
});
};
this.getJsonUrl = function (taskId) {
if (Config.InProductionMode)
return 'http://{0}/bj/check?num={1}'.format(Config.ApiRoot, taskId);
else
return '/Content/json/beijing/{0}.json'.format(taskId);
};
this.LoadData = function (result) {
$.getJSON("http://{0}/bj/getresult/{1}.json".format(Config.ApiRoot, result.num), function (data) {
var param = this.GetTaskParams(this.TaskInfo.Id);
@ -293,7 +300,7 @@
var partten = 'http://{0}/bj/{1}?lon={2}&lat={3}&num={4}&hgt={5}&rlen={6}&tlen={7}&tpoint={8}&rlen2={9}&tlen2={10}&fac={11}';
var url = partten.format(Config.ApiRoot, 'backward', params.lon, params.lat, params.num, params.hgt, params.rlen, params.tlen, params.tpoint, params.rlen2, params.tlen2, params.pullGround);
this.TestModel('202009241710391', parseFloat(params.lat), parseFloat(params.lon));
this.TestModel('202111060851610', parseFloat(params.lat), parseFloat(params.lon));
return;
$.ajax({
@ -318,7 +325,7 @@
$.ajax({
type: "GET",
dataType: 'json',
url: 'http://{0}/bj/check?num={1}'.format(Config.ApiRoot, taskId),
url: this.getJsonUrl(taskId),
success: function (result) {
this.TaskInfo.Id = taskId;
this.TaskInfo.Result = result;

1
04.系统编码/App/Content/scripts/config.js

@ -1,4 +1,5 @@
var Config = function () {
this.InProductionMode = false;
this.ApiRoot = '47.103.85.253:5003';
};

3
04.系统编码/App/Controllers/BeijingController.cs

@ -1,4 +1,5 @@
using System;
using System.Web;
using System.Text;
using System.Web.Mvc;
using System.Collections.Generic;
@ -7,9 +8,7 @@ using Newtonsoft.Json;
using Pingchuan.BeijingSafeguard.BLL;
using Pingchuan.BeijingSafeguard.Model;
using Pingchuan.BeijingSafeguard.App.Controllers;
using MyTask = Pingchuan.BeijingSafeguard.Model.Task;
using System.Web;
namespace BeijingSafeguard.Controllers
{

4
04.系统编码/App/Controllers/PointController.cs

@ -34,10 +34,10 @@ namespace Pingchuan.BeijingSafeguard.App.Controllers
}
[HttpPost]
public JsonResult Query()
public JsonResult Query(string region)
{
User user = GetLoginUser();
List<Point> points = PointBLL.Query(user.Id);
List<Point> points = PointBLL.Query(region, user.Id);
return Json(points);
}
}

4
04.系统编码/BLL/PointBLL.cs

@ -23,9 +23,9 @@ namespace Pingchuan.BeijingSafeguard.BLL
return PointDAL.Delete(id);
}
public static List<Point> Query(int userId)
public static List<Point> Query(string region, int userId)
{
return PointDAL.Query(userId);
return PointDAL.Query(region, userId);
}
}
}

6
04.系统编码/DAL/PointDAL.cs

@ -22,10 +22,10 @@ namespace Pingchuan.BeijingSafeguard.DAL
return db.Delete<Point>(id);
}
public static List<Point> Query(int userId)
public static List<Point> Query(string region, int userId)
{
string sql = $@"select * from points where user_id = @0";
return db.Fetch<Point>(sql, userId);
string sql = $@"select * from points where region = @0 and user_id = @1";
return db.Fetch<Point>(sql, region, userId);
}
}
}

3
04.系统编码/Model/Point.cs

@ -13,6 +13,9 @@ namespace Pingchuan.BeijingSafeguard.Model
[Column("user_id")]
public int UserId { get; set; }
[Column("region")]
public string region { get; set; }
[Column("title")]
public string Title { get; set; }

Loading…
Cancel
Save