diff --git a/Nirvana.Common/ApiBase/ResultInfo.cs b/Nirvana.Common/ApiBase/ResultInfo.cs index c6c3816..9cc5bfa 100644 --- a/Nirvana.Common/ApiBase/ResultInfo.cs +++ b/Nirvana.Common/ApiBase/ResultInfo.cs @@ -71,6 +71,39 @@ namespace Nirvana.Common public static readonly int NORESOURCE = 100002; } + public class ApiResultState + { + /// + /// 系统繁忙 + /// + public static readonly int SYSTEMBUSY = -1; + /// + /// 成功 0 + /// + public static readonly int SUCCESS = 0; + /// + /// 参数有误 + /// + public static readonly int PARAMERROR = 40000; + /// + /// appid无效 + /// + public static readonly int NONAPPID = 40001; + + /// + /// IP不合法 + /// + public static readonly int IPNOALLOW = 40003; + /// + /// 缺少appid参数 + /// + public static readonly int NOAPPID = 41001; + /// + /// 无可用数据 + /// + public static readonly int NODATA = 50001; + } + public class ResultInfoV1 { public string state { get; set; } diff --git a/Nirvana.Common/Extend/Ext.Convert.cs b/Nirvana.Common/Extend/Ext.Convert.cs index f67f700..e0e3180 100644 --- a/Nirvana.Common/Extend/Ext.Convert.cs +++ b/Nirvana.Common/Extend/Ext.Convert.cs @@ -298,7 +298,7 @@ namespace Nirvana.Common /// public static string ToStr(this string data) { - return string.IsNullOrEmpty(data) ? string.Empty : data; + return string.IsNullOrEmpty(data) ? string.Empty : data.Replace(" ",""); } #endregion diff --git a/Nirvana.Common/Extend/Ext.DateTime.cs b/Nirvana.Common/Extend/Ext.DateTime.cs index 53b1a1b..1a68cf2 100644 --- a/Nirvana.Common/Extend/Ext.DateTime.cs +++ b/Nirvana.Common/Extend/Ext.DateTime.cs @@ -266,10 +266,9 @@ namespace Nirvana.Common return month <= 0 ? age*12 : age*12+month; } - public static long GetTimeStamp(this DateTime time) + public static int GetTimeStamp(this DateTime time) { - DateTime dateTimeStart = TimeZoneInfo.ConvertTimeToUtc(new DateTime(1970, 1, 1)); - long t = (time.Ticks - dateTimeStart.Ticks) / 10000;//除10000调整为13位 + int t = Convert.ToInt32((time.ToUniversalTime().Ticks - 621355968000000000) / 10000000); return t; } } diff --git a/Nirvana.Common/Extend/ExtList.cs b/Nirvana.Common/Extend/ExtList.cs index 2b2068a..3e4f86f 100644 --- a/Nirvana.Common/Extend/ExtList.cs +++ b/Nirvana.Common/Extend/ExtList.cs @@ -1,4 +1,5 @@ -using System.Collections; +using System; +using System.Collections; using System.Collections.Generic; namespace Nirvana.Common.Extend @@ -30,5 +31,44 @@ namespace Nirvana.Common.Extend list.CopyTo(array, 0); return new List(array); } + /// + /// list去重 + /// + /// + /// + /// + public static List IDistinctList(this List list) + { + if(list == null || list.Count == 0) + { + return new List(); + } + List newlist = new List(); + foreach(var item in list) + { + if(!newlist.Exists(x=>x == item)) + { + newlist.Add(item); + } + } + return newlist; + } + + public static List IDistinctList(this List list) + { + if (list == null || list.Count == 0) + { + return new List(); + } + List newlist = new List(); + foreach (var item in list) + { + if (!newlist.Exists(x => x== item)) + { + newlist.Add(item); + } + } + return newlist; + } } } diff --git a/Nirvana.Common/Web/WebHelper.cs b/Nirvana.Common/Web/WebHelper.cs index 2075c59..83cebc9 100644 --- a/Nirvana.Common/Web/WebHelper.cs +++ b/Nirvana.Common/Web/WebHelper.cs @@ -62,7 +62,7 @@ namespace Nirvana.Common /// public static string GetCookie(string strName) { - if (MyHttpContext.current.Request.Cookies != null && !string.IsNullOrEmpty(MyHttpContext.current.Request.Cookies[strName])) + if (MyHttpContext.current !=null && MyHttpContext.current.Request.Cookies != null && !string.IsNullOrEmpty(MyHttpContext.current.Request.Cookies[strName])) { return MyHttpContext.current.Request.Cookies[strName]; } @@ -117,7 +117,7 @@ namespace Nirvana.Common { if (key.IsEmpty()) return string.Empty; - if (MyHttpContext.current.Session == null) + if (MyHttpContext.current == null || MyHttpContext.current.Session == null) { return string.Empty; } diff --git a/Waste.Application/ApiAsyncActionFilter.cs b/Waste.Application/ApiAsyncActionFilter.cs new file mode 100644 index 0000000..340ff11 --- /dev/null +++ b/Waste.Application/ApiAsyncActionFilter.cs @@ -0,0 +1,62 @@ +using Furion; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Filters; +using Nirvana.Common; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Waste.Application +{ + public class ApiAsyncActionFilter : Attribute, IAsyncActionFilter + { + private readonly ILoggerService _loggerService; + private readonly IBusinessApiService _businessApiService; + public ApiAsyncActionFilter() + { + _loggerService = App.GetService(); + _businessApiService = App.GetService(); + } + public async Task OnActionExecutionAsync(ActionExecutingContext context, + ActionExecutionDelegate next) + { + // 拦截之前 + var request = context.HttpContext.Request; + if (!request.Query.ContainsKey("appid")) + { + var result = new ResultInfo(ApiResultState.NOAPPID, "缺少appid参数"); + var jsonresult = new JsonResult(result); + context.Result = jsonresult; + return; + } + string appid = request.Query.Where(x => x.Key == "appid").FirstOrDefault().Value; + if (string.IsNullOrEmpty(appid)) + { + var result = new ResultInfo(ApiResultState.NONAPPID, "appid无效"); + var jsonresult = new JsonResult(result); + context.Result = jsonresult; + return; + } + string ip = request.HttpContext.Connection.RemoteIpAddress.ToString(); + var res = await _businessApiService.IsWhiteIP(appid, ip); + if(res.code != ApiResultState.SUCCESS) + { + var jsonresult = new JsonResult(res); + context.Result = jsonresult; + return; + } + var resultContext = await next(); + + // 拦截之后 + + // 异常拦截 + if (resultContext.Exception != null) + { + var action = $"{request.Path}{request.QueryString.Value}"; + _loggerService.AddErrorLogger(resultContext.Exception, $"appid={appid}", action); + } + } + } +} diff --git a/Waste.Application/Business/BusinessApiService.cs b/Waste.Application/Business/BusinessApiService.cs new file mode 100644 index 0000000..b07d164 --- /dev/null +++ b/Waste.Application/Business/BusinessApiService.cs @@ -0,0 +1,183 @@ +using Furion.DependencyInjection; +using Furion.DistributedIDGenerator; +using Nirvana.Common; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Waste.Domain; + +namespace Waste.Application +{ + public class BusinessApiService : BaseInfoService, IBusinessApiService, ITransient + { + private readonly ISqlSugarRepository repository; + private readonly SqlSugarClient dbClient; + + public BusinessApiService(ISqlSugarRepository sqlSugarRepository) + { + repository = sqlSugarRepository; + dbClient = repository.Context; + } + /// + /// 删除 + /// + /// + /// + public async Task DeleteFormAsync(Guid keyValue) + { + if (!await dbClient.Queryable().AnyAsync(x => x.Id == keyValue)) + { + return new ResultInfo(ResultState.FAIL, "记录未找到"); + } + await dbClient.Deleteable().Where(x => x.Id == keyValue).ExecuteCommandAsync(); + return new ResultInfo(ResultState.SUCCESS, "删除成功"); + } + /// + /// 详情 + /// + /// + /// + public async Task DetailAsync(Guid id) + { + return await dbClient.Queryable().FirstAsync(x => x.Id == id); + } + /// + /// 授权列表 + /// + /// + /// + public async Task> GetListAsync(QueryParams param) + { + RefAsync totalnum = 0; + var temquery = dbClient.Queryable(); + if (param.queryParam != null && param.queryParam.Count > 0) + { + List conModels = new List(); + param.queryParam.ForEach(x => + { + if (!string.IsNullOrEmpty(x.Value)) + { + conModels.Add(new ConditionalModel() + { + FieldName = x.Name, + ConditionalType = (ConditionalType)x.Type, + FieldValue = x.Value.Trim() + }); + } + }); + if (conModels.Count > 0) + { + temquery = temquery.Where(conModels); + } + } + string sorts = string.Format("{0} {1}", param.sort, param.order); + var query = await temquery.OrderBy(sorts) + .Select(x => new BusinessApiInfo + { + Id = x.Id, + AppId = x.AppId, + Status = x.Status, + AppSecret = x.AppSecret, + CreateTime = x.CreateTime, + IPList = x.IPList, + PushUrl = x.PushUrl + }) + .Mapper((it, cache) => + { + var allbus = cache.Get(list => + { + var ids = list.Select(x => x.Id).ToList(); + return repository.Change().Context.Queryable().Where(x => ids.Contains(x.Id)).ToList(); + }); + var bus = allbus.FirstOrDefault(x => x.Id == it.Id); + it.BusinessName = bus != null ? bus.Name : ""; + }) + .ToPageListAsync(param.offset, param.limit, totalnum); + return new PageParms + { + page = param.offset, + Items = query, + totalnum = totalnum, + limit = param.limit + }; + } + /// + /// 信息提交 + /// + /// + /// + public async Task SubmitFormAsync(W_BusinessAppApi role) + { + role.IPList = role.IPList.ToStr(); + role.PushUrl = role.PushUrl.ToStr(); + if (string.IsNullOrEmpty(role.PushUrl)) + { + return new ResultInfo(ResultState.FAIL, "推送地址不可为空"); + } + if (!role.PushUrl.ToLower().StartsWith("http")) + { + return new ResultInfo(ResultState.FAIL, "推送地址格式不正确"); + } + if (await dbClient.Queryable().AnyAsync(x => x.Id == role.Id)) + { + await dbClient.Updateable().SetColumns(x => new W_BusinessAppApi + { + PushUrl = role.PushUrl, + IPList = role.IPList + }).Where(x => x.Id == role.Id).ExecuteCommandAsync(); + return new ResultInfo(ResultState.SUCCESS, "授权更新成功"); + } + else + { + role.AppId = $"jt_{IDGen.NextID().ToString("N")}"; + string secret = Md5.md5(role.AppId, 32); + role.AppSecret = Convert.ToBase64String(Encoding.UTF8.GetBytes(secret)); + role.Status = (int)StatusType.Enabled; + role.CreateTime = DateTime.Now; + await dbClient.Insertable(role).ExecuteCommandAsync(); + return new ResultInfo(ResultState.SUCCESS, "授权分配成功"); + } + } + /// + /// 检查是否在IP白名单中 + /// + /// + /// + /// + public async Task IsWhiteIP(string appid, string ip) + { + var data = await dbClient.Queryable().FirstAsync(x => x.AppId == appid); + if (data == null) + { + return new ResultInfo(ApiResultState.NONAPPID, "appid无效"); + } + if (!string.IsNullOrEmpty(data.IPList) && !data.IPList.Contains(ip)) + { + return new ResultInfo(ApiResultState.IPNOALLOW, "IP不合法"); + } + return new ResultInfo(ApiResultState.SUCCESS, "success"); + } + /// + /// 根据商户ID获取详情 + /// + /// + public async Task> GetPushListAsync() + { + var query = await dbClient.Ado.UseStoredProcedure().GetDataTableAsync("proc_getthirdpush", new { }); + var list = query.ToList(); + return list; + } + /// + /// 增加推送消息 + /// + /// + /// + public async Task InsertPushInfoAsync(W_BusinessPush data) + { + await dbClient.Insertable(data).ExecuteCommandAsync(); + } + } +} diff --git a/Waste.Application/Business/BusinessAppService.cs b/Waste.Application/Business/BusinessAppService.cs index 21e5516..b799c04 100644 --- a/Waste.Application/Business/BusinessAppService.cs +++ b/Waste.Application/Business/BusinessAppService.cs @@ -19,11 +19,13 @@ namespace Waste.Application private readonly IBusinessService _businessService; private static readonly string LoginUserKey = Configs.GetString("LoginProviderKey"); private readonly IHttpContextAccessor _httpContextAccessor; + private readonly IBusinessApiService _businessApiService; - public BusinessAppService(IBusinessService businessService, IHttpContextAccessor httpContextAccessor) + public BusinessAppService(IBusinessService businessService, IHttpContextAccessor httpContextAccessor,IBusinessApiService businessApiService) { _businessService = businessService; _httpContextAccessor = httpContextAccessor; + _businessApiService = businessApiService; } /// /// 商户列表 @@ -88,5 +90,38 @@ namespace Waste.Application OperatorProvider.Provider.RemoveCurrent(); return new ResultInfo(ResultState.SUCCESS, "success"); } + + /// + /// 授权列表 + /// + /// + /// + [HttpPost] + public async Task> GetApiListAsync(QueryParams param) + { + return await _businessApiService.GetListAsync(param); + } + + /// + /// 授权信息提交 + /// + /// + /// + [HttpPost] + public async Task SubmitApiFormAsync(W_BusinessAppApi param) + { + return await _businessApiService.SubmitFormAsync(param); + } + /// + /// 删除授权 + /// + /// + /// + [HttpGet] + [QueryParameters] + public async Task DeleteApiFormAsync(Guid keyValue) + { + return await _businessApiService.DeleteFormAsync(keyValue); + } } } diff --git a/Waste.Application/Business/BusinessService.cs b/Waste.Application/Business/BusinessService.cs index 5e3b03a..9d3dae2 100644 --- a/Waste.Application/Business/BusinessService.cs +++ b/Waste.Application/Business/BusinessService.cs @@ -81,7 +81,8 @@ namespace Waste.Application } if (currentUser.AccountType != (int)AccountType.platform) { - tempquery = tempquery.Where(x => x.ParentId == currentUser.BusinessId || x.Id == currentUser.BusinessId); + var sql = $"code like '{currentUser.BusinessCode}'+'%'"; + tempquery = tempquery.Where(sql); } else { diff --git a/Waste.Application/Business/Dtos/BusinessDto.cs b/Waste.Application/Business/Dtos/BusinessDto.cs index 6ff00e7..82a4e9f 100644 --- a/Waste.Application/Business/Dtos/BusinessDto.cs +++ b/Waste.Application/Business/Dtos/BusinessDto.cs @@ -104,4 +104,35 @@ namespace Waste.Application /// public decimal YestodayPureWeight { get; set; } = 0; } + /// + /// 商户授权信息 + /// + public class BusinessApiInfo:W_BusinessAppApi + { + /// + /// 商户名称 + /// + public string BusinessName { get; set; } + } + /// + /// 第三方推送的消息体内容 + /// + public class BusinessApiS2CDto + { + public string devcode { get; set; } + + public string devname { get; set; } + + public string address { get; set; } + + public decimal weight { get; set; } + + public decimal tare { get; set; } + + public decimal pweight { get; set; } + + public string type { get; set; } + + public int time { get; set; } + } } diff --git a/Waste.Application/Business/IBusinessApiService.cs b/Waste.Application/Business/IBusinessApiService.cs new file mode 100644 index 0000000..3d22954 --- /dev/null +++ b/Waste.Application/Business/IBusinessApiService.cs @@ -0,0 +1,59 @@ +using Nirvana.Common; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Waste.Domain; + +namespace Waste.Application +{ + /// + /// 商户授权处理 + /// + public interface IBusinessApiService + { + /// + /// 授权列表 + /// + /// + /// + Task> GetListAsync(QueryParams param); + /// + /// 信息提交 + /// + /// + /// + Task SubmitFormAsync(W_BusinessAppApi role); + /// + /// 删除 + /// + /// + /// + Task DeleteFormAsync(Guid keyValue); + /// + /// 详情 + /// + /// + /// + Task DetailAsync(Guid id); + /// + /// 获取推送列表 + /// + /// + Task> GetPushListAsync(); + /// + /// 检查是否在IP白名单中 + /// + /// + /// + /// + Task IsWhiteIP(string appid, string ip); + /// + /// 增加推送消息 + /// + /// + /// + Task InsertPushInfoAsync(W_BusinessPush data); + } +} diff --git a/Waste.Application/JobWorkder.cs b/Waste.Application/JobWorkder.cs new file mode 100644 index 0000000..67c7df7 --- /dev/null +++ b/Waste.Application/JobWorkder.cs @@ -0,0 +1,102 @@ +using Furion; +using Furion.DependencyInjection; +using Furion.FriendlyException; +using Furion.RemoteRequest.Extensions; +using Furion.TaskScheduler; +using Nirvana.Common; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Waste.Domain; + +namespace Waste.Application +{ + /// + /// 定时任务 + /// + public class JobWorkder : ISpareTimeWorker + { + /// + /// 每隔 5s 执行 + /// + /// + /// + [SpareTime(5000, "推送测量结果", StartNow = true, ExecuteType = SpareTimeExecuteTypes.Serial)] + public void DoSomethingAsync(SpareTimer timer, long count) + { + bool IsTask = App.Configuration["IsTask"].ToBool(); + if (!IsTask) + { + return; + } + Scoped.Create(async (_, scope) => + { + var services = scope.ServiceProvider; + var _businessapiService = App.GetService(services); + var _loggerServicec = App.GetService(services); + //判断是否有异常 + if (timer.Exception.Any()) + { + _loggerServicec.AddLogger($"{count}定时任务发生异常,{timer.Exception.Values.LastOrDefault()?.Message}", 1); + //执行第三次抛异常 + if (count > 2) + { + throw Oops.Oh($"{count}定时任务发生异常"); + } + + } + else + { + var list = await _businessapiService.GetPushListAsync(); + if (list.Count > 0) + { + foreach (W_BusinessPush x in list) + { + //发送请求 + var param = new BusinessApiS2CDto + { + devcode = x.DevCode, + devname = x.DevName, + address = x.Address.ToStr(), + weight = x.Weight, + tare = x.Tare, + pweight = x.PWeight, + type = x.Type, + time = x.Time.GetTimeStamp() + }; + var response = await x.PushUrl + .SetBody(param) + .SetContentType("application/json") + .SetContentEncoding(Encoding.UTF8) + .PostAsync(); + if (response.IsSuccessStatusCode) + { + var returninfo = await response.Content.ReadAsStringAsync(); + if (returninfo.ToLower() == "success") + { + _loggerServicec.AddLogger($"{count}第三方发送成功,参数:{param.ToJson()}\r\n返回值:{returninfo}", 3); + } + else + { + if (x.Cnt < 2) + { + x.Cnt = x.Cnt + 1; + await _businessapiService.InsertPushInfoAsync(x); + } + _loggerServicec.AddLogger($"{count}第三方响应失败,参数:{param.ToJson()}\r\n返回值:{returninfo}", 3); + } + } + else + { + var returninfo = await response.Content.ReadAsStringAsync(); + _loggerServicec.AddLogger($"{count}第三方发送失败,参数:{param.ToJson()}\r\n返回值:{returninfo}", 3); + } + } + } + } + }); + } + } +} diff --git a/Waste.Application/Mapper.cs b/Waste.Application/Mapper.cs index 7cc8ca1..62a044a 100644 --- a/Waste.Application/Mapper.cs +++ b/Waste.Application/Mapper.cs @@ -12,7 +12,12 @@ namespace Waste.Application { public void Register(TypeAdapterConfig config) { - + config.ForType() + .Map(dest => dest.weight, src => src.DayWeight.ToString("f2")) + .Map(dest => dest.pweight, src => src.DayPureWeight.ToString("f2")) + .Map(dest=>dest.time,src=>src.CreateTime.ToString("yyyy-MM-dd")) + .Map(dest=>dest.type,src=>src.WasteType) + ; } } } diff --git a/Waste.Application/PostInfo/SuZhou/SuZhouService.cs b/Waste.Application/PostInfo/SuZhou/SuZhouService.cs index 2f013aa..38337b6 100644 --- a/Waste.Application/PostInfo/SuZhou/SuZhouService.cs +++ b/Waste.Application/PostInfo/SuZhou/SuZhouService.cs @@ -1,4 +1,4 @@ -using Furion; + using Furion; using Furion.DependencyInjection; using Furion.RemoteRequest.Extensions; using MessagePack; diff --git a/Waste.Application/ReportInfo/Dtos/ReportDto.cs b/Waste.Application/ReportInfo/Dtos/ReportDto.cs index c6d7354..c7fb7e2 100644 --- a/Waste.Application/ReportInfo/Dtos/ReportDto.cs +++ b/Waste.Application/ReportInfo/Dtos/ReportDto.cs @@ -21,6 +21,10 @@ namespace Waste.Application /// public string DevName { get; set; } = ""; /// + /// 设备地址 + /// + public string DevAddress { get; set; } = ""; + /// /// 设备编号 /// public string DevCode { get; set; } = ""; @@ -39,4 +43,75 @@ namespace Waste.Application /// public decimal TotalDayWeight { get; set; } = 0; } + + public class ApiReportBaseData + { + public List list { get; set; } + /// + /// 总条数 + /// + public int totalcount { get; set; } + } + + public class ApiReportBaseData + { + /// + /// 点位地址,包含省市区县详细地址 + /// + public string address { get; set; } + /// + /// 设备唯一编号 + /// + public string devcode { get; set; } + /// + /// 设备名称 + /// + public string devname { get; set; } + /// + /// 总毛重,精确到小数点后两位,单位为KG + /// + public string weight { get; set; } + /// + /// 总净重,精确到小数点后两位,单位为KG + /// + public string pweight { get; set; } + /// + /// 垃圾类型 + /// + public string type { get; set; } + /// + /// 统计时间,时间格式 + /// + public string time { get; set; } + } + + public class ApiReportBaseDataItem : W_DeviceStatistics + { + /// + /// 点位地址,包含省市区县详细地址 + /// + public string address { get; set; } + /// + /// 设备唯一编号 + /// + public string devcode { get; set; } + /// + /// 设备名称 + /// + public string devname { get; set; } + } + /// + /// 获取统计结果请求数据 + /// + public class ApiReportRequestData + { + /// + /// 开始时间 + /// + public DateTime begindate { get; set; } + /// + /// 结束时间 + /// + public DateTime enddate { get; set; } + } } diff --git a/Waste.Application/ReportInfo/IReportService.cs b/Waste.Application/ReportInfo/IReportService.cs index 9d79ffe..264fd5b 100644 --- a/Waste.Application/ReportInfo/IReportService.cs +++ b/Waste.Application/ReportInfo/IReportService.cs @@ -24,5 +24,12 @@ namespace Waste.Application /// /// Task> GetListByBusinessAsync(QueryParams param); + /// + /// 获取一定时间段内的统计数据,第三方接口对接使用 + /// + /// + /// 第三方授权的appid + /// + Task GetDataAsync(ApiReportRequestData param,string appid); } } diff --git a/Waste.Application/ReportInfo/ReportAppService.cs b/Waste.Application/ReportInfo/ReportAppService.cs index d5bd321..f6464dc 100644 --- a/Waste.Application/ReportInfo/ReportAppService.cs +++ b/Waste.Application/ReportInfo/ReportAppService.cs @@ -40,5 +40,20 @@ namespace Waste.Application.ReportInfo { return await _reportService.GetListByBusinessAsync(param); } + /// + /// 获取一定时间段内的统计数据,第三方接口对接使用 + /// + /// + /// + /// + [HttpPost] + [QueryParameters] + [ApiDescriptionSettings("Api")] + [ApiAsyncActionFilter] + [NonUnify] + public async Task GetDataAsync([FromQuery]string appid, [FromBody]ApiReportRequestData param) + { + return await _reportService.GetDataAsync(param,appid); + } } } diff --git a/Waste.Application/ReportInfo/ReportService.cs b/Waste.Application/ReportInfo/ReportService.cs index 7a1fc29..31a0ba0 100644 --- a/Waste.Application/ReportInfo/ReportService.cs +++ b/Waste.Application/ReportInfo/ReportService.cs @@ -1,5 +1,7 @@ using Furion.DependencyInjection; +using Mapster; using Nirvana.Common; +using Nirvana.Common.Extend; using SqlSugar; using System; using System.Collections.Generic; @@ -23,6 +25,103 @@ namespace Waste.Application repository = sqlSugarRepository; dbClient = repository.Context; } + /// + /// 获取一定时间段内的统计数据,第三方接口对接使用 + /// + /// + /// 第三方授权的appid + /// + public async Task GetDataAsync(ApiReportRequestData param, string appid) + { + if (string.IsNullOrEmpty(appid)) + { + return new ResultInfo(ApiResultState.NOAPPID, "缺少appid参数"); + } + //根据appid获取商户信息 + var bussapi = await repository.Change().FirstOrDefaultAsync(x => x.AppId == appid); + if (bussapi == null) + { + return new ResultInfo(ApiResultState.NONAPPID, "appid无效"); + } + //检查参数 + if (param.enddate > DateTime.Now.Date.AddDays(-1)) + { + return new ResultInfo(ApiResultState.PARAMERROR, "时间不可大于昨日"); + } + if (param.enddate < param.begindate) + { + return new ResultInfo(ApiResultState.PARAMERROR, "结束时间不可小于开始时间"); + } + if (param.begindate < param.enddate.AddDays(-7)) + { + return new ResultInfo(ApiResultState.PARAMERROR, "时间跨度最多是七日"); + } + if (param.begindate < DateTime.Now.AddMonths(-6)) + { + return new ResultInfo(ApiResultState.PARAMERROR, "超过半年的数据无法进行查询"); + } + var tempquery = dbClient.Queryable(); + tempquery = tempquery.Where(x => x.Businessid == bussapi.Id); + int totalcount = await tempquery.Clone().CountAsync(); + if (totalcount == 0) + { + return new ResultInfo(ApiResultState.NODATA, "无可用数据"); + } + List data = new List(); + var list = await tempquery + .Clone() + .OrderBy(x => x.CreateTime, OrderByType.Asc) + .Select(x => new ApiReportBaseDataItem + { + Id = x.Id, + CreateTime = x.CreateTime, + DevId = x.DevId, + DayCount = x.DayCount, + DayPureWeight = x.DayPureWeight, + DayWeight = x.DayWeight, + WasteType = x.WasteType + }) + .Mapper((it, cache) => + { + var alldev = cache.Get(list => + { + List ids = list.Select(x => x.DevId).ToList(); + List newids = ids.IDistinctList(); + return repository.Change().Context.Queryable().Where(x => newids.Contains(x.Id)).ToList(); + }); + var allarea = cache.Get(list => + { + var provinces = alldev.Select(x => x.Province).ToList(); + var citys = alldev.Select(x => x.City).ToList(); + var areas = alldev.Select(x => x.Area).ToList(); + provinces = provinces.IDistinctList(); + citys = citys.IDistinctList(); + areas = areas.IDistinctList(); + return repository.Change().Where(x => provinces.Contains(x.code) || citys.Contains(x.code) || areas.Contains(x.code)).ToList(); + }); + var dev = alldev.FirstOrDefault(x => x.Id == it.DevId); + if (dev != null) + { + it.devname = dev.Name; + it.devcode = dev.Ecode; + + var Province = allarea.FirstOrDefault(x => x.code == dev.Province); + var City = allarea.FirstOrDefault(x => x.code == dev.City); + var Area = allarea.FirstOrDefault(x => x.code == dev.Area); + it.address = $"{(Province != null ? Province.name.ToStr() : "")}{(City != null ? City.name.ToStr() : "")}{(Area != null ? Area.name.ToStr() : "")}"; + } + var dto = it.Adapt(); + data.Add(dto); + }) + .ToListAsync(); + var returndata = new ApiReportBaseData() + { + list = data, + totalcount = totalcount + }; + return new ResultInfo(ResultState.SUCCESS, "success", returndata); + } + /// /// 统计列表 /// @@ -40,7 +139,7 @@ namespace Waste.Application x.Value = x.Value.ToStr(); if (!string.IsNullOrEmpty(x.Value)) { - if(x.Name.ToLower() == "devname") + if (x.Name.ToLower() == "devname") { temquery = temquery.Where(e => SqlFunc.Subqueryable().Where(w => w.Name == x.Value && e.DevId == w.Id).Any()); } @@ -99,6 +198,7 @@ namespace Waste.Application var dev = alldev.FirstOrDefault(x => x.Id == it.DevId); it.DevName = dev != null ? dev.Name : ""; it.DevCode = dev != null ? dev.Ecode : ""; + it.DevAddress = dev != null ? dev.Address : ""; it.TotalDayCount = totaldaycount; it.TotalDayPureWeight = totaldaypureweight; it.TotalDayWeight = totaldayweight; @@ -157,7 +257,7 @@ namespace Waste.Application { Businessid = x.BusinessId, CreateTime = x.CreateTime, - DayCount = x.DayCount, + DayCount = x.DayCount, DayPureWeight = x.DayPureWeight, DayWeight = x.DayWeight, WasteType = x.WasteType diff --git a/Waste.Application/ResultInfos/ResultService.cs b/Waste.Application/ResultInfos/ResultService.cs index 5ca1d32..63ac0ef 100644 --- a/Waste.Application/ResultInfos/ResultService.cs +++ b/Waste.Application/ResultInfos/ResultService.cs @@ -1,5 +1,8 @@ -using Furion.DependencyInjection; +using Furion; +using Furion.DependencyInjection; using Furion.DistributedIDGenerator; +using Furion.RemoteRequest.Extensions; +using Furion.TaskScheduler; using Nirvana.Common; using SqlSugar; using System; @@ -20,13 +23,15 @@ namespace Waste.Application private readonly SqlSugarClient dbClient; private readonly ILoggerService _loggerService; private readonly ISuZhouService _suZhouService; + private readonly IBusinessApiService _businessApiService; - public ResultService(ISqlSugarRepository sqlSugarRepository, ILoggerService loggerService, ISuZhouService suZhouService) + public ResultService(ISqlSugarRepository sqlSugarRepository, ILoggerService loggerService, ISuZhouService suZhouService,IBusinessApiService businessApiService) { repository = sqlSugarRepository; dbClient = repository.Context; _loggerService = loggerService; _suZhouService = suZhouService; + _businessApiService = businessApiService; } /// /// 获取投放记录 diff --git a/Waste.Application/Test/TestAppService.cs b/Waste.Application/Test/TestAppService.cs new file mode 100644 index 0000000..72a9538 --- /dev/null +++ b/Waste.Application/Test/TestAppService.cs @@ -0,0 +1,36 @@ +using Furion.DynamicApiController; +using Microsoft.AspNetCore.Mvc; +using Nirvana.Common; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Waste.Application +{ + /// + /// 测试专用 + /// + public class TestAppService : IDynamicApiController + { + private readonly ILoggerService _loggerService; + public TestAppService(ILoggerService loggerService) + { + _loggerService = loggerService; + } + /// + /// 接收测试 + /// + /// + /// + [HttpPost] + [NonUnify] + public string Subscribe(BusinessApiS2CDto data) + { + var msg = $"平台推送的消息内容:{data.ToJson()}"; + _loggerService.AddLogger(msg, 1); + return "success"; + } + } +} diff --git a/Waste.Application/Waste.Application.xml b/Waste.Application/Waste.Application.xml index 98c7a3c..34331bf 100644 --- a/Waste.Application/Waste.Application.xml +++ b/Waste.Application/Waste.Application.xml @@ -114,6 +114,48 @@ + + + 删除 + + + + + + + 详情 + + + + + + + 授权列表 + + + + + + + 信息提交 + + + + + + + 检查是否在IP白名单中 + + + + + + + + 根据商户ID获取详情 + + + 商户管理 @@ -161,6 +203,27 @@ + + + 授权列表 + + + + + + + 授权信息提交 + + + + + + + 删除授权 + + + + 商户管理 @@ -364,6 +427,68 @@ 昨日测量净重 + + + 商户授权信息 + + + + + 商户名称 + + + + + 第三方推送的消息体内容 + + + + + 商户授权处理 + + + + + 授权列表 + + + + + + + 信息提交 + + + + + + + 删除 + + + + + + + 详情 + + + + + + + 获取推送列表 + + + + + + 检查是否在IP白名单中 + + + + + 重置密码 @@ -596,6 +721,18 @@ + + + 定时任务 + + + + + 每隔 5s 执行 + + + + 全局异常处理提供器 @@ -1095,6 +1232,11 @@ 设备名称 + + + 设备地址 + + 设备编号 @@ -1115,6 +1257,76 @@ 合计测量重量 + + + 总条数 + + + + + 点位地址,包含省市区县详细地址 + + + + + 设备唯一编号 + + + + + 设备名称 + + + + + 总毛重,精确到小数点后两位,单位为KG + + + + + 总净重,精确到小数点后两位,单位为KG + + + + + 垃圾类型 + + + + + 统计时间,时间格式 + + + + + 点位地址,包含省市区县详细地址 + + + + + 设备唯一编号 + + + + + 设备名称 + + + + + 获取统计结果请求数据 + + + + + 开始时间 + + + + + 结束时间 + + 统计信息 @@ -1134,6 +1346,14 @@ + + + 获取一定时间段内的统计数据,第三方接口对接使用 + + + 第三方授权的appid + + 统计报表 @@ -1153,11 +1373,27 @@ + + + 获取一定时间段内的统计数据,第三方接口对接使用 + + + + + 统计管理 + + + 获取一定时间段内的统计数据,第三方接口对接使用 + + + 第三方授权的appid + + 统计列表 @@ -1656,6 +1892,11 @@ + + + 测试专用 + + 垃圾分类列表 diff --git a/Waste.Core/Waste.Core.csproj b/Waste.Core/Waste.Core.csproj index 6794ab2..c9f53b4 100644 --- a/Waste.Core/Waste.Core.csproj +++ b/Waste.Core/Waste.Core.csproj @@ -15,11 +15,11 @@ - - - - - + + + + + diff --git a/Waste.Doc/Waste.pdb b/Waste.Doc/Waste.pdb index 8fd1ec6..b280fa9 100644 --- a/Waste.Doc/Waste.pdb +++ b/Waste.Doc/Waste.pdb @@ -1,5 +1,5 @@ - + @@ -12,8 +12,8 @@ Waste 1619681546 Administrator -1622166314 -Administrator +1622450529 +Hinse [FolderOptions] [FolderOptions\Physical Objects] @@ -3867,8 +3867,8 @@ PhysOpts= PhysicalDiagram_1 1619681546 Administrator -1622166314 -Administrator +1622450529 +Hinse [DisplayPreferences] [DisplayPreferences\PDM] @@ -4292,7 +4292,7 @@ Shadow=0 1619689000 1619689638 -1 -((-20495,10617), (-7261,21939)) +((-21190,10129), (-6566,22427)) 12615680 16570034 12632256 @@ -4344,7 +4344,7 @@ LABL 0 新宋体,8,N 1619689821 1619689823 -1 -((10199,8495), (24592,20643)) +((9435,7970), (25356,21168)) 12615680 16570034 12632256 @@ -4369,7 +4369,7 @@ LABL 0 新宋体,8,N 1619689847 1620263978 -1 -((-20999,-10387), (-6607,5885)) +((-21764,-11100), (-5842,6598)) 12615680 16570034 12632256 @@ -4394,7 +4394,7 @@ LABL 0 新宋体,8,N 1619690248 1619690516 -1 -((-3983,-883), (11181,7965)) +((-4795,-1258), (11993,8340)) 12615680 16570034 12632256 @@ -4419,7 +4419,7 @@ LABL 0 新宋体,8,N 1619690618 1620263981 -1 -((-3556,-11308), (10450,-2460)) +((-4298,-11683), (11192,-2085)) 12615680 16570034 12632256 @@ -4444,7 +4444,7 @@ LABL 0 新宋体,8,N 1620807179 1620807192 -1 -((-4200,-21078), (4194,-15530)) +((-4616,-21303), (4610,-15305)) 12615680 16570034 12632256 @@ -4469,7 +4469,7 @@ LABL 0 新宋体,8,N 1620818971 1620818987 -1 -((-7197,-32498), (7195,-23650)) +((-7962,-32873), (7960,-23275)) 12615680 16570034 12632256 @@ -4492,9 +4492,9 @@ LABL 0 新宋体,8,N 1621837581 -1621840714 +1622450529 -1 -((-7220,-45195), (8718,-34697)) +((-8077,-45645), (9575,-34247)) 12615680 16570034 12632256 @@ -4517,9 +4517,9 @@ LABL 0 新宋体,8,N 1621840684 -1621840700 +1622450529 -1 -((-7972,-56164), (7966,-46492)) +((-8829,-56577), (8823,-46079)) 12615680 16570034 12632256 @@ -4542,9 +4542,9 @@ LABL 0 新宋体,8,N 1621845782 -1621845835 +1622450529 -1 -((-7197,-67173), (7195,-59151)) +((-7962,-67511), (7960,-58813)) 12615680 16570034 12632256 @@ -4567,9 +4567,9 @@ LABL 0 新宋体,8,N 1622015994 -1622016011 +1622450529 -1 -((-6620,-78593), (6614,-69745)) +((-7315,-78968), (7309,-69370)) 12615680 16570034 12632256 @@ -4592,9 +4592,9 @@ LABL 0 新宋体,8,N 1622016346 -1622016360 +1622450529 -1 -((-6620,-89188), (6614,-81990)) +((-7315,-89488), (7309,-81690)) 12615680 16570034 12632256 @@ -4617,9 +4617,9 @@ LABL 0 新宋体,8,N 1622029336 -1622029364 +1622450529 -1 -((-6620,-98546), (6614,-93823)) +((-7315,-98735), (7309,-93637)) 12615680 16570034 12632256 @@ -4642,9 +4642,9 @@ LABL 0 新宋体,8,N 1622166286 -1622166314 +1622450529 -1 -((-7197,-109143), (7195,-101945)) +((-7962,-109443), (7960,-101645)) 12615680 16570034 12632256 @@ -4665,6 +4665,31 @@ LABL 0 新宋体,8,N + +1622450488 +1622450529 +-1 +((-7314,-120338), (7312,-112540)) +12615680 +16570034 +12632256 +STRN 0 新宋体,8,N +DISPNAME 0 新宋体,8,N +OWNRDISPNAME 0 新宋体,8,N +Columns 0 新宋体,8,N +TablePkColumns 0 新宋体,8,U +TableFkColumns 0 新宋体,8,N +Keys 0 新宋体,8,N +Indexes 0 新宋体,8,N +Triggers 0 新宋体,8,N +LABL 0 新宋体,8,N +6 +65 +16777215 + + + + @@ -4683,7 +4708,7 @@ LABL 0 新宋体,8,N 商户表 - + EAE094A3-4F9B-4A34-B7B5-36CE2CA069FD Id Id @@ -4694,7 +4719,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + D5B117B2-4204-4A8F-B614-935FFCBC1F7B Code Code @@ -4707,7 +4732,7 @@ LABL 0 新宋体,8,N 100 1 - + 6FEE4EA8-49B0-4F2E-95F0-C5295126D8EA ParentId ParentId @@ -4719,7 +4744,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 1524845B-187C-4A6D-8862-959DC2467C16 Name Name @@ -4732,7 +4757,7 @@ LABL 0 新宋体,8,N 100 1 - + 60CF7AD1-F2BC-4B24-90F8-574BE65EDD81 Phone Phone @@ -4745,7 +4770,7 @@ LABL 0 新宋体,8,N 20 1 - + EDA6D2EA-56EC-4145-B770-08D0393CE960 Status Status @@ -4757,7 +4782,7 @@ LABL 0 新宋体,8,N int 1 - + 176F8BE8-5551-433B-AA9C-6DC37589F341 Remark Remark @@ -4770,7 +4795,7 @@ LABL 0 新宋体,8,N 200 1 - + C7152CE9-62A3-4BDD-8C58-A519FA71EBFD Province Province @@ -4783,7 +4808,7 @@ LABL 0 新宋体,8,N 50 1 - + E33C31D6-D772-4B4A-A785-66C13DE1560D City City @@ -4796,7 +4821,7 @@ LABL 0 新宋体,8,N 50 1 - + EC4648B7-3E69-409D-A1E9-462378402C75 Area Area @@ -4809,7 +4834,7 @@ LABL 0 新宋体,8,N 50 1 - + 54F2A6F1-F286-4FC3-A890-36BA8C809A12 Address Address @@ -4822,7 +4847,7 @@ LABL 0 新宋体,8,N 200 1 - + 7C861AC8-B0F4-4DFF-A76C-C18A3D98244C CreateTime CreateTime @@ -4836,7 +4861,7 @@ LABL 0 新宋体,8,N - + 8955CDA4-BC70-4380-8471-90D07B1679A4 Key_1 Key_1 @@ -4845,15 +4870,15 @@ LABL 0 新宋体,8,N 1619689024 Administrator - + - + - + @@ -4867,7 +4892,7 @@ LABL 0 新宋体,8,N 垃圾物品分类 - + 424BBCBB-AB98-4D40-8C4B-9C6E2BAAC8EC Id Id @@ -4878,7 +4903,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 563DED82-6310-48BB-89A0-2BCC0D913DC7 Code Code @@ -4891,7 +4916,7 @@ LABL 0 新宋体,8,N 20 1 - + 5E598A6D-D287-4287-B84A-2ABEAA0FB757 Name Name @@ -4904,7 +4929,7 @@ LABL 0 新宋体,8,N 100 1 - + 2A460ABF-C0F2-4417-BC0E-1DE96969D82A Status Status @@ -4916,7 +4941,7 @@ LABL 0 新宋体,8,N int 1 - + 3EA6B67A-E4EF-47DC-B3BD-6965087009A1 CreateTime CreateTime @@ -4930,7 +4955,7 @@ LABL 0 新宋体,8,N - + E307D2AA-E2D4-4B31-9EB1-E07448FD7768 Key_1 Key_1 @@ -4939,15 +4964,15 @@ LABL 0 新宋体,8,N 1619689530 Administrator - + - + - + @@ -4961,7 +4986,7 @@ LABL 0 新宋体,8,N 账户表 - + FCD48089-A5E1-4673-AF4F-161A922C02BA Id Id @@ -4972,7 +4997,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 346D03BE-04E6-4003-BFA3-21938540E730 UserName UserName @@ -4985,7 +5010,7 @@ LABL 0 新宋体,8,N 50 1 - + 0EA1F5AF-BDD7-4850-BD58-968B00862BAD RealName RealName @@ -4998,7 +5023,7 @@ LABL 0 新宋体,8,N 100 1 - + 32FE8F30-F637-48EC-87FA-68E43CAF9809 Phone Phone @@ -5011,7 +5036,7 @@ LABL 0 新宋体,8,N 50 1 - + 6EAD6C7C-EA78-4E17-B845-69E05FA43B08 Password Password @@ -5024,7 +5049,7 @@ LABL 0 新宋体,8,N 50 1 - + B5268828-D74F-42E1-A686-AF8C55CC99CD Secret Secret @@ -5037,7 +5062,7 @@ LABL 0 新宋体,8,N 50 1 - + 498C89F8-A2D2-42C7-B686-501445872CEA RoleId RoleId @@ -5049,7 +5074,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + F1F92641-E582-4980-86B8-AD903D3EE1E6 AccountType AccountType @@ -5061,7 +5086,7 @@ LABL 0 新宋体,8,N int 1 - + 32559E84-B606-4298-9C1F-C8032F4496DF BusinessId BusinessId @@ -5073,7 +5098,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 1550F6CE-E9C7-4C68-86B6-00286E66931B Status Status @@ -5085,7 +5110,7 @@ LABL 0 新宋体,8,N int 1 - + EF047C05-A619-4069-91E5-80202742C406 LastVisitIP LastVisitIP @@ -5098,7 +5123,7 @@ LABL 0 新宋体,8,N 50 1 - + 2E81436B-2536-4A3C-A274-EC134EB41DC3 LastVisitTime LastVisitTime @@ -5109,7 +5134,7 @@ LABL 0 新宋体,8,N 最近访问时间 datetime - + 5DC1C9D1-1BC4-48D1-BEE3-5FC64BE73278 CreateTime CreateTime @@ -5123,7 +5148,7 @@ LABL 0 新宋体,8,N - + 99E90195-B1DF-4429-837B-86314217FAD1 Key_1 Key_1 @@ -5132,15 +5157,15 @@ LABL 0 新宋体,8,N 1619689815 Administrator - + - + - + @@ -5154,7 +5179,7 @@ LABL 0 新宋体,8,N 设备表 - + A2E88279-AFB8-49CB-A10D-75C855636FEA Id Id @@ -5165,7 +5190,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + EFECEDDC-FAB5-4166-99FF-020BCF4C55E3 FacEcode FacEcode @@ -5178,7 +5203,7 @@ LABL 0 新宋体,8,N 50 1 - + B94CCF4A-19F3-4D0C-BBFD-184E1963BA75 Ecode Ecode @@ -5191,7 +5216,7 @@ LABL 0 新宋体,8,N 50 1 - + 493C2DA4-DFEF-40A7-98B8-081BFB83CB45 DeviceType DeviceType @@ -5203,7 +5228,7 @@ LABL 0 新宋体,8,N int 1 - + 24E5CE1E-F678-4448-BACE-7928351B6941 Name Name @@ -5216,7 +5241,7 @@ LABL 0 新宋体,8,N 100 1 - + BB5F5BC4-A871-425F-8573-933CDEAA5098 Businessid Businessid @@ -5228,7 +5253,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + E18DE320-7060-4CB3-A162-70D78DEE2143 NetType NetType @@ -5240,7 +5265,7 @@ LABL 0 新宋体,8,N int 1 - + 8E337024-A315-47F1-ACF1-4EFC0CF06A28 Province Province @@ -5252,7 +5277,7 @@ LABL 0 新宋体,8,N 50 1 - + DD1BBE78-B55E-458B-ACAE-93477212E255 City City @@ -5265,7 +5290,7 @@ LABL 0 新宋体,8,N 50 1 - + 6300F722-C4E8-4CFC-B4F8-998A228D740A Area Area @@ -5278,7 +5303,7 @@ LABL 0 新宋体,8,N 50 1 - + DC5077A8-E9EA-421C-8DEC-7BFC6E376D3F Address Address @@ -5291,7 +5316,7 @@ LABL 0 新宋体,8,N 200 1 - + 7D506E33-4C24-4966-A23E-464932B94D84 Remark Remark @@ -5304,7 +5329,7 @@ LABL 0 新宋体,8,N 200 1 - + 226BE9DD-94F6-48E9-8D35-BA2AF5AF606D InstallTime InstallTime @@ -5315,7 +5340,7 @@ LABL 0 新宋体,8,N 安装到小区的时间 datetime - + B2DDEB9E-7359-4F5F-827E-88071D461B85 ActiveTime ActiveTime @@ -5326,7 +5351,7 @@ LABL 0 新宋体,8,N 激活时间 datetime - + 661D7181-8EE5-48EF-A04B-6F431C6AC354 Status Status @@ -5338,7 +5363,7 @@ LABL 0 新宋体,8,N int 1 - + F44652B4-37F2-458F-9559-702A0265BC20 LastHeartTime LastHeartTime @@ -5349,7 +5374,7 @@ LABL 0 新宋体,8,N 最近使用时间 datetime - + 1B090CD6-977C-4900-871F-12FE9A1FB31F CreateTime CreateTime @@ -5361,7 +5386,7 @@ LABL 0 新宋体,8,N datetime 1 - + D9867D35-4FAD-4000-84D8-7E4200147760 Tare Tare @@ -5378,7 +5403,7 @@ LABL 0 新宋体,8,N - + 55DDE656-5768-400E-9C78-E53B6E97AA29 Key_1 Key_1 @@ -5387,15 +5412,15 @@ LABL 0 新宋体,8,N 1619689861 Administrator - + - + - + @@ -5409,7 +5434,7 @@ LABL 0 新宋体,8,N 设备实时数据 - + 5B773A68-ABEE-4039-8BA3-B60DE4149F44 Id Id @@ -5420,7 +5445,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + D11BD4F4-95C1-4E0E-BCB1-E39513B4E949 DeviceId DeviceId @@ -5432,7 +5457,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 69CB7474-1CF3-4092-AEE7-BBEE2B242A84 BusinessId BusinessId @@ -5444,7 +5469,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + D983C066-50DD-410E-976E-3D451C240A2B TodayCount TodayCount @@ -5456,7 +5481,7 @@ LABL 0 新宋体,8,N int 1 - + 3666B978-6B39-459F-B5AB-107076C7D61E TotalCount TotalCount @@ -5468,7 +5493,7 @@ LABL 0 新宋体,8,N int 1 - + CE352F39-4DD1-45E2-88F6-0EFAAB2C8133 TodayWeigth TodayWeigth @@ -5482,7 +5507,7 @@ LABL 0 新宋体,8,N 2 1 - + 8814639B-19B7-4600-BFCA-105CF914A2E1 TotalWeight TotalWeight @@ -5496,7 +5521,7 @@ LABL 0 新宋体,8,N 2 1 - + B116E00C-4B6E-4DD7-BBC9-B9EFD4B37BC8 TodayPureWeight TodayPureWeight @@ -5510,7 +5535,7 @@ LABL 0 新宋体,8,N 2 1 - + 0FC5895A-6CDC-4909-A4A5-846C527FD45B TotalPureWeight TotalPureWeight @@ -5526,7 +5551,7 @@ LABL 0 新宋体,8,N - + B079AD1A-1735-449A-899A-707D93543F01 Key_1 Key_1 @@ -5535,15 +5560,15 @@ LABL 0 新宋体,8,N 1619690280 Administrator - + - + - + @@ -5557,7 +5582,7 @@ LABL 0 新宋体,8,N 投放记录 - + DE6E3C24-546A-41C0-87E2-AA733BF1F3B4 Id Id @@ -5568,7 +5593,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 077B62FA-4F62-40AD-BF51-9DAF77067F76 DeviceId DeviceId @@ -5580,7 +5605,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + ACC88E34-5937-4D1D-A856-A03068F4A036 BusinessId BusinessId @@ -5592,7 +5617,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 32048D6F-D2A7-4C30-A5F2-E230C235A237 WasteType WasteType @@ -5605,7 +5630,7 @@ LABL 0 新宋体,8,N 50 1 - + A2B218C4-D530-4513-8188-83DD26B7719C Tare Tare @@ -5619,7 +5644,7 @@ LABL 0 新宋体,8,N 2 1 - + 33AF4358-257C-4FDE-8409-7D7F98324D94 GrossWeight GrossWeight @@ -5633,7 +5658,7 @@ LABL 0 新宋体,8,N 2 1 - + DA09CD95-1452-474D-9DD3-DE78C93C1BF9 NetWeight NetWeight @@ -5647,7 +5672,7 @@ LABL 0 新宋体,8,N 2 1 - + E984E1AB-BEA7-499F-A5A6-5CB5325FC09E Registration Registration @@ -5660,7 +5685,7 @@ LABL 0 新宋体,8,N 200 1 - + 1F9FA8EF-C1FB-4479-AF47-90E8FA430C47 CreateTime CreateTime @@ -5674,7 +5699,7 @@ LABL 0 新宋体,8,N - + ACEDCDE3-0940-4C78-AE4C-848894183D1F Key_1 Key_1 @@ -5683,18 +5708,18 @@ LABL 0 新宋体,8,N 1619690638 Administrator - + - + - + - + ACE4B647-A954-44F7-902A-F3448F4BFAE5 W_Role W_Role @@ -5705,7 +5730,7 @@ LABL 0 新宋体,8,N 角色 - + 5000382C-BC84-4421-8D4C-EF9B5151E7BF Id Id @@ -5716,7 +5741,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + BFBFFA69-2C74-405E-95B3-3CA2B483D751 Name Name @@ -5729,7 +5754,7 @@ LABL 0 新宋体,8,N 50 1 - + 118B7F1F-1775-4F50-B73F-4317077310E2 EnCode EnCode @@ -5742,7 +5767,7 @@ LABL 0 新宋体,8,N 50 1 - + 38B3DD51-CA8D-4AA9-899C-D3583BDDB47C Remark Remark @@ -5755,7 +5780,7 @@ LABL 0 新宋体,8,N 200 1 - + 5936881D-D6D3-4A37-909C-BD2E20C6D9A1 CreateTime CreateTime @@ -5769,7 +5794,7 @@ LABL 0 新宋体,8,N - + CE860C86-FCFC-4B35-BBC4-705445B773CB Key_1 Key_1 @@ -5778,18 +5803,18 @@ LABL 0 新宋体,8,N 1620290672 Administrator - + - + - + - + 208DADDC-2D55-4A0C-BFFA-4CFE3AAF4F34 W_RoleAuthorize W_RoleAuthorize @@ -5800,7 +5825,7 @@ LABL 0 新宋体,8,N 角色菜单 - + 0D7C4194-E4B7-4150-A3D7-52E99EBA9482 Id Id @@ -5811,7 +5836,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + B25F3823-FB47-402A-9F57-8D1E38F98E17 RoleId RoleId @@ -5823,7 +5848,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + FD1484A6-79AE-4EBA-B4ED-1461C3E847F9 MenuId MenuId @@ -5835,7 +5860,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + C36B41D6-C497-4013-97C7-15B64CF2095D CreateTime CreateTime @@ -5849,7 +5874,7 @@ LABL 0 新宋体,8,N - + 95D8732D-9C10-47D0-8CEE-C6AABF24D565 Key_1 Key_1 @@ -5858,18 +5883,18 @@ LABL 0 新宋体,8,N 1620290672 Administrator - + - + - + - + 0B5B6F9F-A9E6-4473-8747-E53FF0962338 W_Menu W_Menu @@ -5880,7 +5905,7 @@ LABL 0 新宋体,8,N 菜单 - + 19063851-86D7-4F3F-B5E3-82962B4802F3 Id Id @@ -5891,7 +5916,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + EFB90817-31A8-40A3-B7F8-5CC3F1FD8AEE ParentId ParentId @@ -5903,7 +5928,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 239CAC63-4876-4B17-ADDB-B1B87E275345 Name Name @@ -5916,7 +5941,7 @@ LABL 0 新宋体,8,N 50 1 - + 493AFF63-21B1-403D-9B09-B8274597E5B8 Icon Icon @@ -5929,7 +5954,7 @@ LABL 0 新宋体,8,N 50 1 - + E922E459-49A5-4D08-8A2B-396426553A64 UrlAddress UrlAddress @@ -5942,7 +5967,7 @@ LABL 0 新宋体,8,N 200 1 - + 785FFECA-9E60-4047-BB96-C457FD417DE7 SortCode SortCode @@ -5954,7 +5979,7 @@ LABL 0 新宋体,8,N int 1 - + A3194E35-565A-4897-8659-10B424219E18 Status Status @@ -5966,7 +5991,7 @@ LABL 0 新宋体,8,N int 1 - + D96339DC-0C0F-4ED6-B3DC-93AE77565E00 CreateTime CreateTime @@ -5980,7 +6005,7 @@ LABL 0 新宋体,8,N - + 9EE04610-E470-486C-A66A-0A6288149CD7 Key_1 Key_1 @@ -5989,15 +6014,15 @@ LABL 0 新宋体,8,N 1620290672 Administrator - + - + - + @@ -6011,7 +6036,7 @@ LABL 0 新宋体,8,N 地址信息配置 - + AC14B4FC-522D-4E1F-B329-30F9B7C955AA Id Id @@ -6022,7 +6047,7 @@ LABL 0 新宋体,8,N int 1 - + C6B310E8-7E4B-4681-8763-B3756BBD5F86 pid pid @@ -6033,7 +6058,7 @@ LABL 0 新宋体,8,N int 1 - + 39797626-12A8-4863-93EB-6F7B523D7B65 name name @@ -6045,7 +6070,7 @@ LABL 0 新宋体,8,N 100 1 - + 931B8CE0-1096-469C-9E48-C8E848BAC1C8 code code @@ -6057,7 +6082,7 @@ LABL 0 新宋体,8,N 50 1 - + B0D39907-E6D0-4C26-B471-D14F34A19CE9 level level @@ -6081,7 +6106,7 @@ LABL 0 新宋体,8,N 设备信息 - + 88AFC42C-53C0-4FB4-AC29-592172FF1858 DeviceId DeviceId @@ -6092,7 +6117,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 1C02E90D-DB3C-4A18-A057-3EB561E3028F ICCID ICCID @@ -6105,7 +6130,7 @@ LABL 0 新宋体,8,N 50 1 - + FC8ABC44-373B-4816-BAE3-CF01E8A786E8 IMEI IMEI @@ -6118,7 +6143,7 @@ LABL 0 新宋体,8,N 50 1 - + 97CEFA2E-6AF6-407A-A3DB-B64D57F2F536 IMSI IMSI @@ -6131,7 +6156,7 @@ LABL 0 新宋体,8,N 50 1 - + B99CCA89-E237-45D2-9D10-545ECD3DC48C Longitude Longitude @@ -6144,7 +6169,7 @@ LABL 0 新宋体,8,N 50 1 - + 732A5A74-F226-462D-8555-E0FBCFEF5342 Latitude Latitude @@ -6157,7 +6182,7 @@ LABL 0 新宋体,8,N 50 1 - + 6A7146AE-73E4-4506-8271-00EC32E395A0 LastBeatTime LastBeatTime @@ -6168,7 +6193,7 @@ LABL 0 新宋体,8,N 最近心跳时间 datetime - + 48A159AE-078F-45B9-B7EB-3CEA7A299D70 LastStartTime LastStartTime @@ -6179,7 +6204,7 @@ LABL 0 新宋体,8,N 最近开机时间 datetime - + 37427A1C-5648-45F1-8AE5-1CE75C54AA26 Sign Sign @@ -6194,7 +6219,7 @@ LABL 0 新宋体,8,N - + 08070677-6F55-4C44-A88D-4ABD632550D8 Key_1 Key_1 @@ -6203,15 +6228,15 @@ LABL 0 新宋体,8,N 1620819000 Administrator - + - + - + @@ -6225,7 +6250,7 @@ LABL 0 新宋体,8,N 商户实时统计数据 - + AD79FCD7-898C-4366-9F24-F809CB080977 Id Id @@ -6236,7 +6261,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 81AD769E-0C49-455F-92AA-D0CFA436A7BD BusinessId BusinessId @@ -6248,7 +6273,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + D96DEE55-90E5-4092-A78D-CC3BD1B5A020 BusinessCnt BusinessCnt @@ -6260,7 +6285,7 @@ LABL 0 新宋体,8,N int 1 - + C52D99B4-3D07-46E9-BDB4-366F83D4495C DevCnt DevCnt @@ -6272,7 +6297,7 @@ LABL 0 新宋体,8,N int 1 - + 366EA4FB-BB74-4B8C-B24D-8D7EF138B970 TodayDevActiveCnt TodayDevActiveCnt @@ -6284,7 +6309,7 @@ LABL 0 新宋体,8,N int 1 - + 1DF9CD44-FD4A-43F1-B258-96B3D8B3FEF0 TodayCount TodayCount @@ -6296,7 +6321,7 @@ LABL 0 新宋体,8,N int 1 - + 7D92ECB9-0513-4EEB-9AC8-15048CFCA262 TodayWeight TodayWeight @@ -6310,7 +6335,7 @@ LABL 0 新宋体,8,N 2 1 - + AEAA8ECB-B505-4A20-BF17-A739E862AACD TodayPureWeight TodayPureWeight @@ -6324,7 +6349,7 @@ LABL 0 新宋体,8,N 2 1 - + 8C1515B0-A1E1-46FB-B9B6-7A7EE99E8AF7 TotalCount TotalCount @@ -6336,7 +6361,7 @@ LABL 0 新宋体,8,N int 1 - + 2C40EDBA-80AD-4C4F-A35D-C77411D3F1DF TotalWeight TotalWeight @@ -6350,7 +6375,7 @@ LABL 0 新宋体,8,N 2 1 - + E57E92FE-7529-4F1C-ACCB-D648A99CF485 TotalPureWeight TotalPureWeight @@ -6366,7 +6391,7 @@ LABL 0 新宋体,8,N - + 5F112707-923A-4F0D-8E17-01FB261D317C Key_1 Key_1 @@ -6375,15 +6400,15 @@ LABL 0 新宋体,8,N 1621837634 Administrator - + - + - + @@ -6397,7 +6422,7 @@ LABL 0 新宋体,8,N 账户总计实时数据 - + 3FECB935-5AE6-4867-89D3-BA84F76C5BA5 Id Id @@ -6408,7 +6433,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + F72D0CB9-5783-4C42-BF3A-AE506C1840E6 BusinessCnt BusinessCnt @@ -6420,7 +6445,7 @@ LABL 0 新宋体,8,N int 1 - + BC9D81F2-2508-4D89-8247-1B368E6C7C8B DevCnt DevCnt @@ -6432,7 +6457,7 @@ LABL 0 新宋体,8,N int 1 - + 2874D41B-450A-4C25-9178-38161514D816 TodayDevActiveCnt TodayDevActiveCnt @@ -6444,7 +6469,7 @@ LABL 0 新宋体,8,N int 1 - + F114B2EA-7F25-4B47-9D1C-9290F23FCB98 TodayCount TodayCount @@ -6456,7 +6481,7 @@ LABL 0 新宋体,8,N int 1 - + 00147609-078F-48C0-BB8A-310031FBABD4 TodayWeight TodayWeight @@ -6470,7 +6495,7 @@ LABL 0 新宋体,8,N 2 1 - + E931A0EE-E064-49CC-95BC-5295BFFA9927 TodayPureWeight TodayPureWeight @@ -6484,7 +6509,7 @@ LABL 0 新宋体,8,N 2 1 - + D863CB0C-1228-4108-B7DC-ED7B4759CDF4 TotalCount TotalCount @@ -6496,7 +6521,7 @@ LABL 0 新宋体,8,N int 1 - + 1940C18D-F7E2-4033-B708-680E44DE2710 TotalWeight TotalWeight @@ -6510,7 +6535,7 @@ LABL 0 新宋体,8,N 2 1 - + F15F6BD9-2089-4979-994E-4B794DF700AE TotalPureWeight TotalPureWeight @@ -6526,7 +6551,7 @@ LABL 0 新宋体,8,N - + ADFCF82A-CBD9-4B6E-8507-DB48BA848FC3 Key_1 Key_1 @@ -6535,15 +6560,15 @@ LABL 0 新宋体,8,N 1621840707 Administrator - + - + - + @@ -6557,7 +6582,7 @@ LABL 0 新宋体,8,N 设备统计 - + 6F68FC6F-62A6-48B9-830E-BE41598AC3EE Id Id @@ -6569,7 +6594,7 @@ LABL 0 新宋体,8,N 1 1 - + 74DADCF7-93A9-4F93-AF4C-1B30E6ED844D Businessid Businessid @@ -6581,7 +6606,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 29A0E824-F619-4E48-B6D9-1B69AF143710 DevId DevId @@ -6593,7 +6618,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 18B63CFA-1BE1-4659-8ADA-237E102BFA87 DayCount DayCount @@ -6605,7 +6630,7 @@ LABL 0 新宋体,8,N int 1 - + 98E9442A-B5E3-4612-9745-E2B078A63C1C DayWeight DayWeight @@ -6619,7 +6644,7 @@ LABL 0 新宋体,8,N 2 1 - + 4EBE0415-F9BD-497F-9C41-E614AF99D1DC DayPureWeight DayPureWeight @@ -6633,7 +6658,7 @@ LABL 0 新宋体,8,N 2 1 - + 8DD45777-4948-49B4-8684-822E28DA6876 WasteType WasteType @@ -6646,7 +6671,7 @@ LABL 0 新宋体,8,N 50 1 - + DF48BAB3-A662-4E2F-97F2-AB8A42461135 CreateTime CreateTime @@ -6660,7 +6685,7 @@ LABL 0 新宋体,8,N - + E5462E67-D593-45E3-88CA-00A920CFF72E Key_1 Key_1 @@ -6669,15 +6694,15 @@ LABL 0 新宋体,8,N 1621845844 Administrator - + - + - + @@ -6691,7 +6716,7 @@ LABL 0 新宋体,8,N 地产区域 - + 55DF7B52-A439-43E8-95CA-EDAF1C479E49 Id Id @@ -6702,7 +6727,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 03D35C30-FA35-49DD-B3CF-680DB42F76C9 AdId AdId @@ -6715,7 +6740,7 @@ LABL 0 新宋体,8,N 50 1 - + 188B451F-FE49-49E5-B64A-B736DA998E16 Code Code @@ -6728,7 +6753,7 @@ LABL 0 新宋体,8,N 50 1 - + 31EB6C96-39E7-450D-99D9-87836E9524A9 Name Name @@ -6741,7 +6766,7 @@ LABL 0 新宋体,8,N 100 1 - + 3EF5EBCF-6A87-4EE0-BED5-73FE52746732 Addr Addr @@ -6754,7 +6779,7 @@ LABL 0 新宋体,8,N 300 1 - + CE00A46F-396D-44BE-85EE-56435E048632 City City @@ -6766,7 +6791,7 @@ LABL 0 新宋体,8,N 50 1 - + B3F5D215-A2D9-41A3-872D-9389668A6AE5 Area Area @@ -6778,7 +6803,7 @@ LABL 0 新宋体,8,N 50 1 - + DBBECB3A-0F7D-47D7-848C-C023376D3194 Street Street @@ -6790,7 +6815,7 @@ LABL 0 新宋体,8,N 50 1 - + CBE167C1-C1D1-426A-B123-0DA2E051C716 CreateTime CreateTime @@ -6804,7 +6829,7 @@ LABL 0 新宋体,8,N - + 862A6BDE-103E-4399-8DE1-595E0B3506FA Key_1 Key_1 @@ -6813,15 +6838,15 @@ LABL 0 新宋体,8,N 1622016023 Administrator - + - + - + @@ -6835,7 +6860,7 @@ LABL 0 新宋体,8,N 采集点 - + 259A3E4D-5118-4532-B0EA-013B6F0900D6 Id Id @@ -6846,7 +6871,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 03B74128-F1C6-4D72-ACFC-B94302F4CF9C CoId CoId @@ -6859,7 +6884,7 @@ LABL 0 新宋体,8,N 50 1 - + F5C25882-F109-470B-A3C1-6108E4D87A98 EstateId EstateId @@ -6872,7 +6897,7 @@ LABL 0 新宋体,8,N 50 1 - + 8B185000-6590-41A2-B002-F935EE06F319 Code Code @@ -6885,7 +6910,7 @@ LABL 0 新宋体,8,N 50 1 - + ED56B9E2-221D-4515-B0E2-8DC02A1075FE Name Name @@ -6898,7 +6923,7 @@ LABL 0 新宋体,8,N 200 1 - + CBFAFADA-D9FB-4F50-A41A-3A667E2DB57B Addr Addr @@ -6911,7 +6936,7 @@ LABL 0 新宋体,8,N 300 1 - + 299740EE-DAC0-423F-AA35-60B9826A848C CreateTime CreateTime @@ -6925,7 +6950,7 @@ LABL 0 新宋体,8,N - + D1E36FF7-2AA7-4483-8E4E-410A6948B272 Key_1 Key_1 @@ -6934,15 +6959,15 @@ LABL 0 新宋体,8,N 1622016369 Administrator - + - + - + @@ -6956,7 +6981,7 @@ LABL 0 新宋体,8,N 苏州设备平台关联的设备信息 - + 7F78376E-4C29-4AEB-B8B1-1858EF392610 DeviceId DeviceId @@ -6968,7 +6993,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 44813611-8D0A-49B9-ACC1-F376FD53B84C SecretHash SecretHash @@ -6981,7 +7006,7 @@ LABL 0 新宋体,8,N 50 1 - + D7416041-0A79-46D8-9A94-2122128CCE3A DevId DevId @@ -6994,7 +7019,7 @@ LABL 0 新宋体,8,N 50 1 - + 0990FE7F-A2CF-40A4-928A-6DC1F04240EA Secret Secret @@ -7009,7 +7034,7 @@ LABL 0 新宋体,8,N - + 62DC23BC-A091-45B0-9C3C-73C99C708380 Key_1 Key_1 @@ -7018,15 +7043,15 @@ LABL 0 新宋体,8,N 1622029379 Administrator - + - + - + @@ -7040,7 +7065,7 @@ LABL 0 新宋体,8,N 商户统计 - + 3D60FD17-5B95-4721-935D-54E7C169B4CA Id Id @@ -7052,7 +7077,7 @@ LABL 0 新宋体,8,N 1 1 - + 395B3916-5887-45A3-9479-62FC5F951F29 BusinessId BusinessId @@ -7064,7 +7089,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + CBAF2317-428E-4C4C-B460-A348D734D9C4 WasteType WasteType @@ -7077,7 +7102,7 @@ LABL 0 新宋体,8,N 50 1 - + 276B54F1-ABE2-4EB0-9910-B848C1B8CD6D DayCount DayCount @@ -7089,7 +7114,7 @@ LABL 0 新宋体,8,N int 1 - + D85ADB63-8D57-4FD1-A82C-BFA1DA772AC0 DayWeight DayWeight @@ -7103,7 +7128,7 @@ LABL 0 新宋体,8,N 2 1 - + 51FB3DB7-D53C-4398-BC8F-3686A384C0DB DayPureWeight DayPureWeight @@ -7117,7 +7142,7 @@ LABL 0 新宋体,8,N 2 1 - + 3CDC3DC9-01A7-4FB7-9162-CC22BC13AA60 CreateTime CreateTime @@ -7130,7 +7155,7 @@ LABL 0 新宋体,8,N - + 20F9C1AF-6D11-4F28-8D42-52916F00279A Key_1 Key_1 @@ -7139,20 +7164,139 @@ LABL 0 新宋体,8,N 1622166322 Administrator - + - + - + + + + +17830E45-10B6-44EF-A987-AE6B678882BE +W_BusinessAppApi +W_BusinessAppApi +1622450488 +Hinse +1622515958 +Hinse +商户授权信息 + + + +A5F257D6-07E3-40EE-BCD4-615499D7E172 +Id +Id +1622450529 +Hinse +1622450574 +Hinse +商户的BusinessId +uniqueidentifier +1 + + +287B4700-0D34-458A-AC1B-D41ADBB12E31 +PushUrl +PushUrl +1622450622 +Hinse +1622450958 +Hinse +消息推送地址 +varchar(200) +200 +1 + + +AAAEAE3B-A7A2-4C49-B10D-E0E37479FF69 +IPList +IPList +1622451899 +Hinse +1622451949 +Hinse +IP白名单列表,为空则不限制 +varchar(200) +200 +1 + + +83FA21A0-893A-4304-BC6C-5DFCBEC88BDD +AppId +AppId +1622515889 +Hinse +1622515935 +Hinse +varchar(50) +50 +1 + + +E914A54A-D676-4D34-A0DF-47BDF596AED5 +AppSecret +AppSecret +1622515935 +Hinse +1622515947 +Hinse +varchar(50) +50 +1 + + +6ED84FBE-CA94-4DAE-8F50-9F62F2D8098F +Status +Status +1622450544 +Hinse +1622450604 +Hinse +状态,0-禁用,1-正常 +int +1 + + +F767CDE0-DE19-4032-B573-EF94BFCD5DDF +CreateTime +CreateTime +1622450591 +Hinse +1622450629 +Hinse +添加时间 +datetime +1 + + + + +7EEA89C8-2D58-4850-81A0-8FD31CFF794C +Key_1 +Key_1 +1622450529 +Hinse +1622450544 +Hinse + + + + + + + + + + - + 5728945A-1970-4CD5-B0BB-972845F49F99 PUBLIC PUBLIC @@ -7163,7 +7307,7 @@ LABL 0 新宋体,8,N - + 1FC152BA-25A4-4408-A3C4-4E73CB309440 Microsoft SQL Server 2012 MSSQLSRV2012 diff --git a/Waste.Doc/Waste.pdm b/Waste.Doc/Waste.pdm index 8fd1ec6..72bdec1 100644 --- a/Waste.Doc/Waste.pdm +++ b/Waste.Doc/Waste.pdm @@ -1,5 +1,5 @@ - + @@ -12,8 +12,8 @@ Waste 1619681546 Administrator -1622166314 -Administrator +1622604918 +Hinse [FolderOptions] [FolderOptions\Physical Objects] @@ -3867,8 +3867,8 @@ PhysOpts= PhysicalDiagram_1 1619681546 Administrator -1622166314 -Administrator +1622450529 +Hinse [DisplayPreferences] [DisplayPreferences\PDM] @@ -4292,7 +4292,7 @@ Shadow=0 1619689000 1619689638 -1 -((-20495,10617), (-7261,21939)) +((-21190,10129), (-6566,22427)) 12615680 16570034 12632256 @@ -4344,7 +4344,7 @@ LABL 0 新宋体,8,N 1619689821 1619689823 -1 -((10199,8495), (24592,20643)) +((9435,7970), (25356,21168)) 12615680 16570034 12632256 @@ -4369,7 +4369,7 @@ LABL 0 新宋体,8,N 1619689847 1620263978 -1 -((-20999,-10387), (-6607,5885)) +((-21764,-11100), (-5842,6598)) 12615680 16570034 12632256 @@ -4394,7 +4394,7 @@ LABL 0 新宋体,8,N 1619690248 1619690516 -1 -((-3983,-883), (11181,7965)) +((-4795,-1258), (11993,8340)) 12615680 16570034 12632256 @@ -4419,7 +4419,7 @@ LABL 0 新宋体,8,N 1619690618 1620263981 -1 -((-3556,-11308), (10450,-2460)) +((-4298,-11683), (11192,-2085)) 12615680 16570034 12632256 @@ -4444,7 +4444,7 @@ LABL 0 新宋体,8,N 1620807179 1620807192 -1 -((-4200,-21078), (4194,-15530)) +((-4616,-21303), (4610,-15305)) 12615680 16570034 12632256 @@ -4469,7 +4469,7 @@ LABL 0 新宋体,8,N 1620818971 1620818987 -1 -((-7197,-32498), (7195,-23650)) +((-7962,-32873), (7960,-23275)) 12615680 16570034 12632256 @@ -4492,9 +4492,9 @@ LABL 0 新宋体,8,N 1621837581 -1621840714 +1622450529 -1 -((-7220,-45195), (8718,-34697)) +((-8077,-45645), (9575,-34247)) 12615680 16570034 12632256 @@ -4517,9 +4517,9 @@ LABL 0 新宋体,8,N 1621840684 -1621840700 +1622450529 -1 -((-7972,-56164), (7966,-46492)) +((-8829,-56577), (8823,-46079)) 12615680 16570034 12632256 @@ -4542,9 +4542,9 @@ LABL 0 新宋体,8,N 1621845782 -1621845835 +1622450529 -1 -((-7197,-67173), (7195,-59151)) +((-7962,-67511), (7960,-58813)) 12615680 16570034 12632256 @@ -4567,9 +4567,9 @@ LABL 0 新宋体,8,N 1622015994 -1622016011 +1622450529 -1 -((-6620,-78593), (6614,-69745)) +((-7315,-78968), (7309,-69370)) 12615680 16570034 12632256 @@ -4592,9 +4592,9 @@ LABL 0 新宋体,8,N 1622016346 -1622016360 +1622450529 -1 -((-6620,-89188), (6614,-81990)) +((-7315,-89488), (7309,-81690)) 12615680 16570034 12632256 @@ -4617,9 +4617,9 @@ LABL 0 新宋体,8,N 1622029336 -1622029364 +1622450529 -1 -((-6620,-98546), (6614,-93823)) +((-7315,-98735), (7309,-93637)) 12615680 16570034 12632256 @@ -4642,9 +4642,9 @@ LABL 0 新宋体,8,N 1622166286 -1622166314 +1622450529 -1 -((-7197,-109143), (7195,-101945)) +((-7962,-109443), (7960,-101645)) 12615680 16570034 12632256 @@ -4665,6 +4665,31 @@ LABL 0 新宋体,8,N + +1622450488 +1622450529 +-1 +((-7314,-120338), (7312,-112540)) +12615680 +16570034 +12632256 +STRN 0 新宋体,8,N +DISPNAME 0 新宋体,8,N +OWNRDISPNAME 0 新宋体,8,N +Columns 0 新宋体,8,N +TablePkColumns 0 新宋体,8,U +TableFkColumns 0 新宋体,8,N +Keys 0 新宋体,8,N +Indexes 0 新宋体,8,N +Triggers 0 新宋体,8,N +LABL 0 新宋体,8,N +6 +65 +16777215 + + + + @@ -4683,7 +4708,7 @@ LABL 0 新宋体,8,N 商户表 - + EAE094A3-4F9B-4A34-B7B5-36CE2CA069FD Id Id @@ -4694,7 +4719,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + D5B117B2-4204-4A8F-B614-935FFCBC1F7B Code Code @@ -4707,7 +4732,7 @@ LABL 0 新宋体,8,N 100 1 - + 6FEE4EA8-49B0-4F2E-95F0-C5295126D8EA ParentId ParentId @@ -4719,7 +4744,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 1524845B-187C-4A6D-8862-959DC2467C16 Name Name @@ -4732,7 +4757,7 @@ LABL 0 新宋体,8,N 100 1 - + 60CF7AD1-F2BC-4B24-90F8-574BE65EDD81 Phone Phone @@ -4745,7 +4770,7 @@ LABL 0 新宋体,8,N 20 1 - + EDA6D2EA-56EC-4145-B770-08D0393CE960 Status Status @@ -4757,7 +4782,7 @@ LABL 0 新宋体,8,N int 1 - + 176F8BE8-5551-433B-AA9C-6DC37589F341 Remark Remark @@ -4770,7 +4795,7 @@ LABL 0 新宋体,8,N 200 1 - + C7152CE9-62A3-4BDD-8C58-A519FA71EBFD Province Province @@ -4783,7 +4808,7 @@ LABL 0 新宋体,8,N 50 1 - + E33C31D6-D772-4B4A-A785-66C13DE1560D City City @@ -4796,7 +4821,7 @@ LABL 0 新宋体,8,N 50 1 - + EC4648B7-3E69-409D-A1E9-462378402C75 Area Area @@ -4809,7 +4834,7 @@ LABL 0 新宋体,8,N 50 1 - + 54F2A6F1-F286-4FC3-A890-36BA8C809A12 Address Address @@ -4822,7 +4847,7 @@ LABL 0 新宋体,8,N 200 1 - + 7C861AC8-B0F4-4DFF-A76C-C18A3D98244C CreateTime CreateTime @@ -4836,7 +4861,7 @@ LABL 0 新宋体,8,N - + 8955CDA4-BC70-4380-8471-90D07B1679A4 Key_1 Key_1 @@ -4845,15 +4870,15 @@ LABL 0 新宋体,8,N 1619689024 Administrator - + - + - + @@ -4867,7 +4892,7 @@ LABL 0 新宋体,8,N 垃圾物品分类 - + 424BBCBB-AB98-4D40-8C4B-9C6E2BAAC8EC Id Id @@ -4878,7 +4903,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 563DED82-6310-48BB-89A0-2BCC0D913DC7 Code Code @@ -4891,7 +4916,7 @@ LABL 0 新宋体,8,N 20 1 - + 5E598A6D-D287-4287-B84A-2ABEAA0FB757 Name Name @@ -4904,7 +4929,7 @@ LABL 0 新宋体,8,N 100 1 - + 2A460ABF-C0F2-4417-BC0E-1DE96969D82A Status Status @@ -4916,7 +4941,7 @@ LABL 0 新宋体,8,N int 1 - + 3EA6B67A-E4EF-47DC-B3BD-6965087009A1 CreateTime CreateTime @@ -4930,7 +4955,7 @@ LABL 0 新宋体,8,N - + E307D2AA-E2D4-4B31-9EB1-E07448FD7768 Key_1 Key_1 @@ -4939,15 +4964,15 @@ LABL 0 新宋体,8,N 1619689530 Administrator - + - + - + @@ -4961,7 +4986,7 @@ LABL 0 新宋体,8,N 账户表 - + FCD48089-A5E1-4673-AF4F-161A922C02BA Id Id @@ -4972,7 +4997,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 346D03BE-04E6-4003-BFA3-21938540E730 UserName UserName @@ -4985,7 +5010,7 @@ LABL 0 新宋体,8,N 50 1 - + 0EA1F5AF-BDD7-4850-BD58-968B00862BAD RealName RealName @@ -4998,7 +5023,7 @@ LABL 0 新宋体,8,N 100 1 - + 32FE8F30-F637-48EC-87FA-68E43CAF9809 Phone Phone @@ -5011,7 +5036,7 @@ LABL 0 新宋体,8,N 50 1 - + 6EAD6C7C-EA78-4E17-B845-69E05FA43B08 Password Password @@ -5024,7 +5049,7 @@ LABL 0 新宋体,8,N 50 1 - + B5268828-D74F-42E1-A686-AF8C55CC99CD Secret Secret @@ -5037,7 +5062,7 @@ LABL 0 新宋体,8,N 50 1 - + 498C89F8-A2D2-42C7-B686-501445872CEA RoleId RoleId @@ -5049,7 +5074,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + F1F92641-E582-4980-86B8-AD903D3EE1E6 AccountType AccountType @@ -5061,7 +5086,7 @@ LABL 0 新宋体,8,N int 1 - + 32559E84-B606-4298-9C1F-C8032F4496DF BusinessId BusinessId @@ -5073,7 +5098,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 1550F6CE-E9C7-4C68-86B6-00286E66931B Status Status @@ -5085,7 +5110,7 @@ LABL 0 新宋体,8,N int 1 - + EF047C05-A619-4069-91E5-80202742C406 LastVisitIP LastVisitIP @@ -5098,7 +5123,7 @@ LABL 0 新宋体,8,N 50 1 - + 2E81436B-2536-4A3C-A274-EC134EB41DC3 LastVisitTime LastVisitTime @@ -5109,7 +5134,7 @@ LABL 0 新宋体,8,N 最近访问时间 datetime - + 5DC1C9D1-1BC4-48D1-BEE3-5FC64BE73278 CreateTime CreateTime @@ -5123,7 +5148,7 @@ LABL 0 新宋体,8,N - + 99E90195-B1DF-4429-837B-86314217FAD1 Key_1 Key_1 @@ -5132,15 +5157,15 @@ LABL 0 新宋体,8,N 1619689815 Administrator - + - + - + @@ -5154,7 +5179,7 @@ LABL 0 新宋体,8,N 设备表 - + A2E88279-AFB8-49CB-A10D-75C855636FEA Id Id @@ -5165,7 +5190,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + EFECEDDC-FAB5-4166-99FF-020BCF4C55E3 FacEcode FacEcode @@ -5178,7 +5203,7 @@ LABL 0 新宋体,8,N 50 1 - + B94CCF4A-19F3-4D0C-BBFD-184E1963BA75 Ecode Ecode @@ -5191,7 +5216,7 @@ LABL 0 新宋体,8,N 50 1 - + 493C2DA4-DFEF-40A7-98B8-081BFB83CB45 DeviceType DeviceType @@ -5203,7 +5228,7 @@ LABL 0 新宋体,8,N int 1 - + 24E5CE1E-F678-4448-BACE-7928351B6941 Name Name @@ -5216,7 +5241,7 @@ LABL 0 新宋体,8,N 100 1 - + BB5F5BC4-A871-425F-8573-933CDEAA5098 Businessid Businessid @@ -5228,7 +5253,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + E18DE320-7060-4CB3-A162-70D78DEE2143 NetType NetType @@ -5240,7 +5265,7 @@ LABL 0 新宋体,8,N int 1 - + 8E337024-A315-47F1-ACF1-4EFC0CF06A28 Province Province @@ -5252,7 +5277,7 @@ LABL 0 新宋体,8,N 50 1 - + DD1BBE78-B55E-458B-ACAE-93477212E255 City City @@ -5265,7 +5290,7 @@ LABL 0 新宋体,8,N 50 1 - + 6300F722-C4E8-4CFC-B4F8-998A228D740A Area Area @@ -5278,7 +5303,7 @@ LABL 0 新宋体,8,N 50 1 - + DC5077A8-E9EA-421C-8DEC-7BFC6E376D3F Address Address @@ -5291,7 +5316,7 @@ LABL 0 新宋体,8,N 200 1 - + 7D506E33-4C24-4966-A23E-464932B94D84 Remark Remark @@ -5304,7 +5329,7 @@ LABL 0 新宋体,8,N 200 1 - + 226BE9DD-94F6-48E9-8D35-BA2AF5AF606D InstallTime InstallTime @@ -5315,7 +5340,7 @@ LABL 0 新宋体,8,N 安装到小区的时间 datetime - + B2DDEB9E-7359-4F5F-827E-88071D461B85 ActiveTime ActiveTime @@ -5326,7 +5351,7 @@ LABL 0 新宋体,8,N 激活时间 datetime - + 661D7181-8EE5-48EF-A04B-6F431C6AC354 Status Status @@ -5338,7 +5363,7 @@ LABL 0 新宋体,8,N int 1 - + F44652B4-37F2-458F-9559-702A0265BC20 LastHeartTime LastHeartTime @@ -5349,7 +5374,7 @@ LABL 0 新宋体,8,N 最近使用时间 datetime - + 1B090CD6-977C-4900-871F-12FE9A1FB31F CreateTime CreateTime @@ -5361,7 +5386,7 @@ LABL 0 新宋体,8,N datetime 1 - + D9867D35-4FAD-4000-84D8-7E4200147760 Tare Tare @@ -5378,7 +5403,7 @@ LABL 0 新宋体,8,N - + 55DDE656-5768-400E-9C78-E53B6E97AA29 Key_1 Key_1 @@ -5387,15 +5412,15 @@ LABL 0 新宋体,8,N 1619689861 Administrator - + - + - + @@ -5409,7 +5434,7 @@ LABL 0 新宋体,8,N 设备实时数据 - + 5B773A68-ABEE-4039-8BA3-B60DE4149F44 Id Id @@ -5420,7 +5445,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + D11BD4F4-95C1-4E0E-BCB1-E39513B4E949 DeviceId DeviceId @@ -5432,7 +5457,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 69CB7474-1CF3-4092-AEE7-BBEE2B242A84 BusinessId BusinessId @@ -5444,7 +5469,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + D983C066-50DD-410E-976E-3D451C240A2B TodayCount TodayCount @@ -5456,7 +5481,7 @@ LABL 0 新宋体,8,N int 1 - + 3666B978-6B39-459F-B5AB-107076C7D61E TotalCount TotalCount @@ -5468,7 +5493,7 @@ LABL 0 新宋体,8,N int 1 - + CE352F39-4DD1-45E2-88F6-0EFAAB2C8133 TodayWeigth TodayWeigth @@ -5482,7 +5507,7 @@ LABL 0 新宋体,8,N 2 1 - + 8814639B-19B7-4600-BFCA-105CF914A2E1 TotalWeight TotalWeight @@ -5496,7 +5521,7 @@ LABL 0 新宋体,8,N 2 1 - + B116E00C-4B6E-4DD7-BBC9-B9EFD4B37BC8 TodayPureWeight TodayPureWeight @@ -5510,7 +5535,7 @@ LABL 0 新宋体,8,N 2 1 - + 0FC5895A-6CDC-4909-A4A5-846C527FD45B TotalPureWeight TotalPureWeight @@ -5526,7 +5551,7 @@ LABL 0 新宋体,8,N - + B079AD1A-1735-449A-899A-707D93543F01 Key_1 Key_1 @@ -5535,15 +5560,15 @@ LABL 0 新宋体,8,N 1619690280 Administrator - + - + - + @@ -5557,7 +5582,7 @@ LABL 0 新宋体,8,N 投放记录 - + DE6E3C24-546A-41C0-87E2-AA733BF1F3B4 Id Id @@ -5568,7 +5593,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 077B62FA-4F62-40AD-BF51-9DAF77067F76 DeviceId DeviceId @@ -5580,7 +5605,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + ACC88E34-5937-4D1D-A856-A03068F4A036 BusinessId BusinessId @@ -5592,7 +5617,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 32048D6F-D2A7-4C30-A5F2-E230C235A237 WasteType WasteType @@ -5605,7 +5630,7 @@ LABL 0 新宋体,8,N 50 1 - + A2B218C4-D530-4513-8188-83DD26B7719C Tare Tare @@ -5619,7 +5644,7 @@ LABL 0 新宋体,8,N 2 1 - + 33AF4358-257C-4FDE-8409-7D7F98324D94 GrossWeight GrossWeight @@ -5633,7 +5658,7 @@ LABL 0 新宋体,8,N 2 1 - + DA09CD95-1452-474D-9DD3-DE78C93C1BF9 NetWeight NetWeight @@ -5647,7 +5672,7 @@ LABL 0 新宋体,8,N 2 1 - + E984E1AB-BEA7-499F-A5A6-5CB5325FC09E Registration Registration @@ -5660,7 +5685,7 @@ LABL 0 新宋体,8,N 200 1 - + 1F9FA8EF-C1FB-4479-AF47-90E8FA430C47 CreateTime CreateTime @@ -5674,7 +5699,7 @@ LABL 0 新宋体,8,N - + ACEDCDE3-0940-4C78-AE4C-848894183D1F Key_1 Key_1 @@ -5683,18 +5708,18 @@ LABL 0 新宋体,8,N 1619690638 Administrator - + - + - + - + ACE4B647-A954-44F7-902A-F3448F4BFAE5 W_Role W_Role @@ -5705,7 +5730,7 @@ LABL 0 新宋体,8,N 角色 - + 5000382C-BC84-4421-8D4C-EF9B5151E7BF Id Id @@ -5716,7 +5741,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + BFBFFA69-2C74-405E-95B3-3CA2B483D751 Name Name @@ -5729,7 +5754,7 @@ LABL 0 新宋体,8,N 50 1 - + 118B7F1F-1775-4F50-B73F-4317077310E2 EnCode EnCode @@ -5742,7 +5767,7 @@ LABL 0 新宋体,8,N 50 1 - + 38B3DD51-CA8D-4AA9-899C-D3583BDDB47C Remark Remark @@ -5755,7 +5780,7 @@ LABL 0 新宋体,8,N 200 1 - + 5936881D-D6D3-4A37-909C-BD2E20C6D9A1 CreateTime CreateTime @@ -5769,7 +5794,7 @@ LABL 0 新宋体,8,N - + CE860C86-FCFC-4B35-BBC4-705445B773CB Key_1 Key_1 @@ -5778,18 +5803,18 @@ LABL 0 新宋体,8,N 1620290672 Administrator - + - + - + - + 208DADDC-2D55-4A0C-BFFA-4CFE3AAF4F34 W_RoleAuthorize W_RoleAuthorize @@ -5800,7 +5825,7 @@ LABL 0 新宋体,8,N 角色菜单 - + 0D7C4194-E4B7-4150-A3D7-52E99EBA9482 Id Id @@ -5811,7 +5836,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + B25F3823-FB47-402A-9F57-8D1E38F98E17 RoleId RoleId @@ -5823,7 +5848,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + FD1484A6-79AE-4EBA-B4ED-1461C3E847F9 MenuId MenuId @@ -5835,7 +5860,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + C36B41D6-C497-4013-97C7-15B64CF2095D CreateTime CreateTime @@ -5849,7 +5874,7 @@ LABL 0 新宋体,8,N - + 95D8732D-9C10-47D0-8CEE-C6AABF24D565 Key_1 Key_1 @@ -5858,18 +5883,18 @@ LABL 0 新宋体,8,N 1620290672 Administrator - + - + - + - + 0B5B6F9F-A9E6-4473-8747-E53FF0962338 W_Menu W_Menu @@ -5880,7 +5905,7 @@ LABL 0 新宋体,8,N 菜单 - + 19063851-86D7-4F3F-B5E3-82962B4802F3 Id Id @@ -5891,7 +5916,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + EFB90817-31A8-40A3-B7F8-5CC3F1FD8AEE ParentId ParentId @@ -5903,7 +5928,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 239CAC63-4876-4B17-ADDB-B1B87E275345 Name Name @@ -5916,7 +5941,7 @@ LABL 0 新宋体,8,N 50 1 - + 493AFF63-21B1-403D-9B09-B8274597E5B8 Icon Icon @@ -5929,7 +5954,7 @@ LABL 0 新宋体,8,N 50 1 - + E922E459-49A5-4D08-8A2B-396426553A64 UrlAddress UrlAddress @@ -5942,7 +5967,7 @@ LABL 0 新宋体,8,N 200 1 - + 785FFECA-9E60-4047-BB96-C457FD417DE7 SortCode SortCode @@ -5954,7 +5979,7 @@ LABL 0 新宋体,8,N int 1 - + A3194E35-565A-4897-8659-10B424219E18 Status Status @@ -5966,7 +5991,7 @@ LABL 0 新宋体,8,N int 1 - + D96339DC-0C0F-4ED6-B3DC-93AE77565E00 CreateTime CreateTime @@ -5980,7 +6005,7 @@ LABL 0 新宋体,8,N - + 9EE04610-E470-486C-A66A-0A6288149CD7 Key_1 Key_1 @@ -5989,15 +6014,15 @@ LABL 0 新宋体,8,N 1620290672 Administrator - + - + - + @@ -6011,7 +6036,7 @@ LABL 0 新宋体,8,N 地址信息配置 - + AC14B4FC-522D-4E1F-B329-30F9B7C955AA Id Id @@ -6022,7 +6047,7 @@ LABL 0 新宋体,8,N int 1 - + C6B310E8-7E4B-4681-8763-B3756BBD5F86 pid pid @@ -6033,7 +6058,7 @@ LABL 0 新宋体,8,N int 1 - + 39797626-12A8-4863-93EB-6F7B523D7B65 name name @@ -6045,7 +6070,7 @@ LABL 0 新宋体,8,N 100 1 - + 931B8CE0-1096-469C-9E48-C8E848BAC1C8 code code @@ -6057,7 +6082,7 @@ LABL 0 新宋体,8,N 50 1 - + B0D39907-E6D0-4C26-B471-D14F34A19CE9 level level @@ -6081,7 +6106,7 @@ LABL 0 新宋体,8,N 设备信息 - + 88AFC42C-53C0-4FB4-AC29-592172FF1858 DeviceId DeviceId @@ -6092,7 +6117,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 1C02E90D-DB3C-4A18-A057-3EB561E3028F ICCID ICCID @@ -6105,7 +6130,7 @@ LABL 0 新宋体,8,N 50 1 - + FC8ABC44-373B-4816-BAE3-CF01E8A786E8 IMEI IMEI @@ -6118,7 +6143,7 @@ LABL 0 新宋体,8,N 50 1 - + 97CEFA2E-6AF6-407A-A3DB-B64D57F2F536 IMSI IMSI @@ -6131,7 +6156,7 @@ LABL 0 新宋体,8,N 50 1 - + B99CCA89-E237-45D2-9D10-545ECD3DC48C Longitude Longitude @@ -6144,7 +6169,7 @@ LABL 0 新宋体,8,N 50 1 - + 732A5A74-F226-462D-8555-E0FBCFEF5342 Latitude Latitude @@ -6157,7 +6182,7 @@ LABL 0 新宋体,8,N 50 1 - + 6A7146AE-73E4-4506-8271-00EC32E395A0 LastBeatTime LastBeatTime @@ -6168,7 +6193,7 @@ LABL 0 新宋体,8,N 最近心跳时间 datetime - + 48A159AE-078F-45B9-B7EB-3CEA7A299D70 LastStartTime LastStartTime @@ -6179,7 +6204,7 @@ LABL 0 新宋体,8,N 最近开机时间 datetime - + 37427A1C-5648-45F1-8AE5-1CE75C54AA26 Sign Sign @@ -6194,7 +6219,7 @@ LABL 0 新宋体,8,N - + 08070677-6F55-4C44-A88D-4ABD632550D8 Key_1 Key_1 @@ -6203,15 +6228,15 @@ LABL 0 新宋体,8,N 1620819000 Administrator - + - + - + @@ -6225,7 +6250,7 @@ LABL 0 新宋体,8,N 商户实时统计数据 - + AD79FCD7-898C-4366-9F24-F809CB080977 Id Id @@ -6236,7 +6261,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 81AD769E-0C49-455F-92AA-D0CFA436A7BD BusinessId BusinessId @@ -6248,7 +6273,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + D96DEE55-90E5-4092-A78D-CC3BD1B5A020 BusinessCnt BusinessCnt @@ -6260,7 +6285,7 @@ LABL 0 新宋体,8,N int 1 - + C52D99B4-3D07-46E9-BDB4-366F83D4495C DevCnt DevCnt @@ -6272,7 +6297,7 @@ LABL 0 新宋体,8,N int 1 - + 366EA4FB-BB74-4B8C-B24D-8D7EF138B970 TodayDevActiveCnt TodayDevActiveCnt @@ -6284,7 +6309,7 @@ LABL 0 新宋体,8,N int 1 - + 1DF9CD44-FD4A-43F1-B258-96B3D8B3FEF0 TodayCount TodayCount @@ -6296,7 +6321,7 @@ LABL 0 新宋体,8,N int 1 - + 7D92ECB9-0513-4EEB-9AC8-15048CFCA262 TodayWeight TodayWeight @@ -6310,7 +6335,7 @@ LABL 0 新宋体,8,N 2 1 - + AEAA8ECB-B505-4A20-BF17-A739E862AACD TodayPureWeight TodayPureWeight @@ -6324,7 +6349,7 @@ LABL 0 新宋体,8,N 2 1 - + 8C1515B0-A1E1-46FB-B9B6-7A7EE99E8AF7 TotalCount TotalCount @@ -6336,7 +6361,7 @@ LABL 0 新宋体,8,N int 1 - + 2C40EDBA-80AD-4C4F-A35D-C77411D3F1DF TotalWeight TotalWeight @@ -6350,7 +6375,7 @@ LABL 0 新宋体,8,N 2 1 - + E57E92FE-7529-4F1C-ACCB-D648A99CF485 TotalPureWeight TotalPureWeight @@ -6366,7 +6391,7 @@ LABL 0 新宋体,8,N - + 5F112707-923A-4F0D-8E17-01FB261D317C Key_1 Key_1 @@ -6375,15 +6400,15 @@ LABL 0 新宋体,8,N 1621837634 Administrator - + - + - + @@ -6397,7 +6422,7 @@ LABL 0 新宋体,8,N 账户总计实时数据 - + 3FECB935-5AE6-4867-89D3-BA84F76C5BA5 Id Id @@ -6408,7 +6433,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + F72D0CB9-5783-4C42-BF3A-AE506C1840E6 BusinessCnt BusinessCnt @@ -6420,7 +6445,7 @@ LABL 0 新宋体,8,N int 1 - + BC9D81F2-2508-4D89-8247-1B368E6C7C8B DevCnt DevCnt @@ -6432,7 +6457,7 @@ LABL 0 新宋体,8,N int 1 - + 2874D41B-450A-4C25-9178-38161514D816 TodayDevActiveCnt TodayDevActiveCnt @@ -6444,7 +6469,7 @@ LABL 0 新宋体,8,N int 1 - + F114B2EA-7F25-4B47-9D1C-9290F23FCB98 TodayCount TodayCount @@ -6456,7 +6481,7 @@ LABL 0 新宋体,8,N int 1 - + 00147609-078F-48C0-BB8A-310031FBABD4 TodayWeight TodayWeight @@ -6470,7 +6495,7 @@ LABL 0 新宋体,8,N 2 1 - + E931A0EE-E064-49CC-95BC-5295BFFA9927 TodayPureWeight TodayPureWeight @@ -6484,7 +6509,7 @@ LABL 0 新宋体,8,N 2 1 - + D863CB0C-1228-4108-B7DC-ED7B4759CDF4 TotalCount TotalCount @@ -6496,7 +6521,7 @@ LABL 0 新宋体,8,N int 1 - + 1940C18D-F7E2-4033-B708-680E44DE2710 TotalWeight TotalWeight @@ -6510,7 +6535,7 @@ LABL 0 新宋体,8,N 2 1 - + F15F6BD9-2089-4979-994E-4B794DF700AE TotalPureWeight TotalPureWeight @@ -6526,7 +6551,7 @@ LABL 0 新宋体,8,N - + ADFCF82A-CBD9-4B6E-8507-DB48BA848FC3 Key_1 Key_1 @@ -6535,15 +6560,15 @@ LABL 0 新宋体,8,N 1621840707 Administrator - + - + - + @@ -6557,7 +6582,7 @@ LABL 0 新宋体,8,N 设备统计 - + 6F68FC6F-62A6-48B9-830E-BE41598AC3EE Id Id @@ -6569,7 +6594,7 @@ LABL 0 新宋体,8,N 1 1 - + 74DADCF7-93A9-4F93-AF4C-1B30E6ED844D Businessid Businessid @@ -6581,7 +6606,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 29A0E824-F619-4E48-B6D9-1B69AF143710 DevId DevId @@ -6593,7 +6618,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 18B63CFA-1BE1-4659-8ADA-237E102BFA87 DayCount DayCount @@ -6605,7 +6630,7 @@ LABL 0 新宋体,8,N int 1 - + 98E9442A-B5E3-4612-9745-E2B078A63C1C DayWeight DayWeight @@ -6619,7 +6644,7 @@ LABL 0 新宋体,8,N 2 1 - + 4EBE0415-F9BD-497F-9C41-E614AF99D1DC DayPureWeight DayPureWeight @@ -6633,7 +6658,7 @@ LABL 0 新宋体,8,N 2 1 - + 8DD45777-4948-49B4-8684-822E28DA6876 WasteType WasteType @@ -6646,7 +6671,7 @@ LABL 0 新宋体,8,N 50 1 - + DF48BAB3-A662-4E2F-97F2-AB8A42461135 CreateTime CreateTime @@ -6660,7 +6685,7 @@ LABL 0 新宋体,8,N - + E5462E67-D593-45E3-88CA-00A920CFF72E Key_1 Key_1 @@ -6669,15 +6694,15 @@ LABL 0 新宋体,8,N 1621845844 Administrator - + - + - + @@ -6691,7 +6716,7 @@ LABL 0 新宋体,8,N 地产区域 - + 55DF7B52-A439-43E8-95CA-EDAF1C479E49 Id Id @@ -6702,7 +6727,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 03D35C30-FA35-49DD-B3CF-680DB42F76C9 AdId AdId @@ -6715,7 +6740,7 @@ LABL 0 新宋体,8,N 50 1 - + 188B451F-FE49-49E5-B64A-B736DA998E16 Code Code @@ -6728,7 +6753,7 @@ LABL 0 新宋体,8,N 50 1 - + 31EB6C96-39E7-450D-99D9-87836E9524A9 Name Name @@ -6741,7 +6766,7 @@ LABL 0 新宋体,8,N 100 1 - + 3EF5EBCF-6A87-4EE0-BED5-73FE52746732 Addr Addr @@ -6754,7 +6779,7 @@ LABL 0 新宋体,8,N 300 1 - + CE00A46F-396D-44BE-85EE-56435E048632 City City @@ -6766,7 +6791,7 @@ LABL 0 新宋体,8,N 50 1 - + B3F5D215-A2D9-41A3-872D-9389668A6AE5 Area Area @@ -6778,7 +6803,7 @@ LABL 0 新宋体,8,N 50 1 - + DBBECB3A-0F7D-47D7-848C-C023376D3194 Street Street @@ -6790,7 +6815,7 @@ LABL 0 新宋体,8,N 50 1 - + CBE167C1-C1D1-426A-B123-0DA2E051C716 CreateTime CreateTime @@ -6804,7 +6829,7 @@ LABL 0 新宋体,8,N - + 862A6BDE-103E-4399-8DE1-595E0B3506FA Key_1 Key_1 @@ -6813,15 +6838,15 @@ LABL 0 新宋体,8,N 1622016023 Administrator - + - + - + @@ -6835,7 +6860,7 @@ LABL 0 新宋体,8,N 采集点 - + 259A3E4D-5118-4532-B0EA-013B6F0900D6 Id Id @@ -6846,7 +6871,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 03B74128-F1C6-4D72-ACFC-B94302F4CF9C CoId CoId @@ -6859,7 +6884,7 @@ LABL 0 新宋体,8,N 50 1 - + F5C25882-F109-470B-A3C1-6108E4D87A98 EstateId EstateId @@ -6872,7 +6897,7 @@ LABL 0 新宋体,8,N 50 1 - + 8B185000-6590-41A2-B002-F935EE06F319 Code Code @@ -6885,7 +6910,7 @@ LABL 0 新宋体,8,N 50 1 - + ED56B9E2-221D-4515-B0E2-8DC02A1075FE Name Name @@ -6898,7 +6923,7 @@ LABL 0 新宋体,8,N 200 1 - + CBFAFADA-D9FB-4F50-A41A-3A667E2DB57B Addr Addr @@ -6911,7 +6936,7 @@ LABL 0 新宋体,8,N 300 1 - + 299740EE-DAC0-423F-AA35-60B9826A848C CreateTime CreateTime @@ -6925,7 +6950,7 @@ LABL 0 新宋体,8,N - + D1E36FF7-2AA7-4483-8E4E-410A6948B272 Key_1 Key_1 @@ -6934,15 +6959,15 @@ LABL 0 新宋体,8,N 1622016369 Administrator - + - + - + @@ -6956,7 +6981,7 @@ LABL 0 新宋体,8,N 苏州设备平台关联的设备信息 - + 7F78376E-4C29-4AEB-B8B1-1858EF392610 DeviceId DeviceId @@ -6968,7 +6993,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + 44813611-8D0A-49B9-ACC1-F376FD53B84C SecretHash SecretHash @@ -6981,7 +7006,7 @@ LABL 0 新宋体,8,N 50 1 - + D7416041-0A79-46D8-9A94-2122128CCE3A DevId DevId @@ -6994,7 +7019,7 @@ LABL 0 新宋体,8,N 50 1 - + 0990FE7F-A2CF-40A4-928A-6DC1F04240EA Secret Secret @@ -7009,7 +7034,7 @@ LABL 0 新宋体,8,N - + 62DC23BC-A091-45B0-9C3C-73C99C708380 Key_1 Key_1 @@ -7018,15 +7043,15 @@ LABL 0 新宋体,8,N 1622029379 Administrator - + - + - + @@ -7040,7 +7065,7 @@ LABL 0 新宋体,8,N 商户统计 - + 3D60FD17-5B95-4721-935D-54E7C169B4CA Id Id @@ -7052,7 +7077,7 @@ LABL 0 新宋体,8,N 1 1 - + 395B3916-5887-45A3-9479-62FC5F951F29 BusinessId BusinessId @@ -7064,7 +7089,7 @@ LABL 0 新宋体,8,N uniqueidentifier 1 - + CBAF2317-428E-4C4C-B460-A348D734D9C4 WasteType WasteType @@ -7077,7 +7102,7 @@ LABL 0 新宋体,8,N 50 1 - + 276B54F1-ABE2-4EB0-9910-B848C1B8CD6D DayCount DayCount @@ -7089,7 +7114,7 @@ LABL 0 新宋体,8,N int 1 - + D85ADB63-8D57-4FD1-A82C-BFA1DA772AC0 DayWeight DayWeight @@ -7103,7 +7128,7 @@ LABL 0 新宋体,8,N 2 1 - + 51FB3DB7-D53C-4398-BC8F-3686A384C0DB DayPureWeight DayPureWeight @@ -7117,7 +7142,7 @@ LABL 0 新宋体,8,N 2 1 - + 3CDC3DC9-01A7-4FB7-9162-CC22BC13AA60 CreateTime CreateTime @@ -7130,7 +7155,7 @@ LABL 0 新宋体,8,N - + 20F9C1AF-6D11-4F28-8D42-52916F00279A Key_1 Key_1 @@ -7139,20 +7164,139 @@ LABL 0 新宋体,8,N 1622166322 Administrator - + - + - + + + + +17830E45-10B6-44EF-A987-AE6B678882BE +W_BusinessAppApi +W_BusinessAppApi +1622450488 +Hinse +1622515958 +Hinse +商户授权信息 + + + +A5F257D6-07E3-40EE-BCD4-615499D7E172 +Id +Id +1622450529 +Hinse +1622450574 +Hinse +商户的BusinessId +uniqueidentifier +1 + + +287B4700-0D34-458A-AC1B-D41ADBB12E31 +PushUrl +PushUrl +1622450622 +Hinse +1622450958 +Hinse +消息推送地址 +varchar(200) +200 +1 + + +AAAEAE3B-A7A2-4C49-B10D-E0E37479FF69 +IPList +IPList +1622451899 +Hinse +1622451949 +Hinse +IP白名单列表,为空则不限制 +varchar(200) +200 +1 + + +83FA21A0-893A-4304-BC6C-5DFCBEC88BDD +AppId +AppId +1622515889 +Hinse +1622515935 +Hinse +varchar(50) +50 +1 + + +E914A54A-D676-4D34-A0DF-47BDF596AED5 +AppSecret +AppSecret +1622515935 +Hinse +1622515947 +Hinse +varchar(50) +50 +1 + + +6ED84FBE-CA94-4DAE-8F50-9F62F2D8098F +Status +Status +1622450544 +Hinse +1622450604 +Hinse +状态,0-禁用,1-正常 +int +1 + + +F767CDE0-DE19-4032-B573-EF94BFCD5DDF +CreateTime +CreateTime +1622450591 +Hinse +1622450629 +Hinse +添加时间 +datetime +1 + + + + +7EEA89C8-2D58-4850-81A0-8FD31CFF794C +Key_1 +Key_1 +1622450529 +Hinse +1622450544 +Hinse + + + + + + + + + + - + 5728945A-1970-4CD5-B0BB-972845F49F99 PUBLIC PUBLIC @@ -7163,7 +7307,7 @@ LABL 0 新宋体,8,N - + 1FC152BA-25A4-4408-A3C4-4E73CB309440 Microsoft SQL Server 2012 MSSQLSRV2012 diff --git a/Waste.Domain/DataModel/W_BusinessAppApi.cs b/Waste.Domain/DataModel/W_BusinessAppApi.cs new file mode 100644 index 0000000..7d66fd2 --- /dev/null +++ b/Waste.Domain/DataModel/W_BusinessAppApi.cs @@ -0,0 +1,60 @@ +using SqlSugar; + +namespace Waste.Domain +{ + /// + /// 商户授权信息 + /// + public class W_BusinessAppApi + { + /// + /// 商户授权信息 + /// + public W_BusinessAppApi() + { + } + + private System.Guid _Id; + /// + /// 商户的BusinessId + /// + [SugarColumn(IsPrimaryKey = true)] + public System.Guid Id { get { return this._Id; } set { this._Id = value; } } + + private System.String _PushUrl; + /// + /// 消息推送地址 + /// + public System.String PushUrl { get { return this._PushUrl; } set { this._PushUrl = value?.Trim(); } } + + private System.String _IPList; + /// + /// IP白名单列表,为空则不限制 + /// + public System.String IPList { get { return this._IPList; } set { this._IPList = value?.Trim(); } } + + private System.String _AppId; + /// + /// + /// + public System.String AppId { get { return this._AppId; } set { this._AppId = value?.Trim(); } } + + private System.String _AppSecret; + /// + /// + /// + public System.String AppSecret { get { return this._AppSecret; } set { this._AppSecret = value?.Trim(); } } + + private System.Int32 _Status; + /// + /// 状态,0-禁用,1-正常 + /// + public System.Int32 Status { get { return this._Status; } set { this._Status = value; } } + + private System.DateTime _CreateTime; + /// + /// 添加时间 + /// + public System.DateTime CreateTime { get { return this._CreateTime; } set { this._CreateTime = value; } } + } +} diff --git a/Waste.Domain/DataModel/W_BusinessPush.cs b/Waste.Domain/DataModel/W_BusinessPush.cs new file mode 100644 index 0000000..0a8a661 --- /dev/null +++ b/Waste.Domain/DataModel/W_BusinessPush.cs @@ -0,0 +1,89 @@ +using SqlSugar; + +namespace Waste.Domain +{ + /// + /// 商户消息推送 + /// + public class W_BusinessPush + { + /// + /// 商户消息推送 + /// + public W_BusinessPush() + { + } + + private System.Guid _BusinessId; + /// + /// + /// + public System.Guid BusinessId { get { return this._BusinessId; } set { this._BusinessId = value; } } + + private System.String _PushUrl; + /// + /// 推送地址 + /// + public System.String PushUrl { get { return this._PushUrl; } set { this._PushUrl = value?.Trim(); } } + + private System.String _DevCode; + /// + /// 设备唯一编号 + /// + public System.String DevCode { get { return this._DevCode; } set { this._DevCode = value?.Trim(); } } + + private System.String _DevName; + /// + /// 设备名称 + /// + public System.String DevName { get { return this._DevName; } set { this._DevName = value?.Trim(); } } + + private System.String _Address; + /// + /// 设备地址 + /// + public System.String Address { get { return this._Address; } set { this._Address = value?.Trim(); } } + + private System.Decimal _Weight; + /// + /// 毛重 + /// + public System.Decimal Weight { get { return this._Weight; } set { this._Weight = value; } } + + private System.Decimal _Tare; + /// + /// 皮重 + /// + public System.Decimal Tare { get { return this._Tare; } set { this._Tare = value; } } + + private System.Decimal _PWeight; + /// + /// 净重 + /// + public System.Decimal PWeight { get { return this._PWeight; } set { this._PWeight = value; } } + + private System.String _Type; + /// + /// 垃圾类型 + /// + public System.String Type { get { return this._Type; } set { this._Type = value?.Trim(); } } + + private System.DateTime _Time; + /// + /// 测量时间 + /// + public System.DateTime Time { get { return this._Time; } set { this._Time = value; } } + + private System.Int32 _Cnt; + /// + /// 重试推送的次数 + /// + public System.Int32 Cnt { get { return this._Cnt; } set { this._Cnt = value; } } + + private System.DateTime _CreateTime; + /// + /// 添加时间 + /// + public System.DateTime CreateTime { get { return this._CreateTime; } set { this._CreateTime = value; } } + } +} diff --git a/Waste.Web.Core/Startup.cs b/Waste.Web.Core/Startup.cs index 388c64a..da7d764 100644 --- a/Waste.Web.Core/Startup.cs +++ b/Waste.Web.Core/Startup.cs @@ -25,7 +25,7 @@ namespace Waste.Web.Core //}); services.AddDataProtection().PersistKeysToFileSystem(new DirectoryInfo(Directory.GetCurrentDirectory() + Path.DirectorySeparatorChar + "DataProtection")); services.AddCorsAccessor(); - // services.AddRemoteRequest(); + // services.AddRemoteRequest(); services.AddHttpClient(); services.AddControllers(options => { options.EnableEndpointRouting = true; @@ -40,6 +40,7 @@ namespace Waste.Web.Core options.SerializerSettings.ContractResolver = new CustomContractResolver(); }); services.AddSingleton(); + services.AddTaskScheduler(); #region 注入获取IP services.AddSingleton(); MyHttpContext.serviceCollection = services; diff --git a/Waste.Web.Entry/Pages/AppApi/Edit.cshtml b/Waste.Web.Entry/Pages/AppApi/Edit.cshtml new file mode 100644 index 0000000..14c1e05 --- /dev/null +++ b/Waste.Web.Entry/Pages/AppApi/Edit.cshtml @@ -0,0 +1,62 @@ +@page +@model Waste.Web.Entry.Pages.AppApi.EditModel +@{ + ViewData["Title"] = "授权管理"; +} +
+
+
+
+ +
+ +
+
+
+ +
+ + 必须以http开头 +
+
+
+ +
+ + 多个IP之间以;分隔 +
+
+
+ +
+
+
+
+@section Scripts{ + +} \ No newline at end of file diff --git a/Waste.Web.Entry/Pages/AppApi/Edit.cshtml.cs b/Waste.Web.Entry/Pages/AppApi/Edit.cshtml.cs new file mode 100644 index 0000000..04b33eb --- /dev/null +++ b/Waste.Web.Entry/Pages/AppApi/Edit.cshtml.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Waste.Application; +using Waste.Domain; + +namespace Waste.Web.Entry.Pages.AppApi +{ + public class EditModel : BaseModel + { + private readonly IBusinessService _businessService; + private readonly IBusinessApiService _businessApiService; + + public List blist = new List(); + + public W_BusinessAppApi data = new W_BusinessAppApi(); + + public EditModel(IBusinessService businessService, IBusinessApiService businessApiService) + { + _businessService = businessService; + _businessApiService = businessApiService; + } + public async Task OnGetAsync(Guid? id=null) + { + blist = await _businessService.GetAllList(); + if(id.HasValue && id.Value != Guid.Empty) + { + data = await _businessApiService.DetailAsync(id.Value); + } + } + } +} diff --git a/Waste.Web.Entry/Pages/AppApi/Index.cshtml b/Waste.Web.Entry/Pages/AppApi/Index.cshtml new file mode 100644 index 0000000..73a210d --- /dev/null +++ b/Waste.Web.Entry/Pages/AppApi/Index.cshtml @@ -0,0 +1,108 @@ +@page +@model Waste.Web.Entry.Pages.AppApi.IndexModel +@{ + ViewData["Title"] = "授权平台"; +} +
+
+
+
+
+ +
+
+
+ + +
+
+
+
+ +
+
+
+ +@section Scripts +{ + +} \ No newline at end of file diff --git a/Waste.Web.Entry/Pages/AppApi/Index.cshtml.cs b/Waste.Web.Entry/Pages/AppApi/Index.cshtml.cs new file mode 100644 index 0000000..8bd2538 --- /dev/null +++ b/Waste.Web.Entry/Pages/AppApi/Index.cshtml.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Waste.Application; +using Waste.Domain; + +namespace Waste.Web.Entry.Pages.AppApi +{ + public class IndexModel : BaseModel + { + private readonly IBusinessService _businessService; + public List blist = new List(); + public IndexModel(IBusinessService businessService) + { + _businessService = businessService; + } + public async Task OnGetAsync() + { + blist = await _businessService.GetAllList(); + } + } +} diff --git a/Waste.Web.Entry/Pages/CountInfo/Index.cshtml b/Waste.Web.Entry/Pages/CountInfo/Index.cshtml index b8d3f3a..b9bee37 100644 --- a/Waste.Web.Entry/Pages/CountInfo/Index.cshtml +++ b/Waste.Web.Entry/Pages/CountInfo/Index.cshtml @@ -206,6 +206,9 @@ }, { field: 'devcode', title: '设备编号', hide: true + }, + { + field: 'devaddress', title: '设备地址', hide: false } , { diff --git a/Waste.Web.Entry/Properties/PublishProfiles/waste.ybhdmob.com.pubxml.user b/Waste.Web.Entry/Properties/PublishProfiles/waste.ybhdmob.com.pubxml.user index 68ab6ed..e5fa80b 100644 --- a/Waste.Web.Entry/Properties/PublishProfiles/waste.ybhdmob.com.pubxml.user +++ b/Waste.Web.Entry/Properties/PublishProfiles/waste.ybhdmob.com.pubxml.user @@ -5,6 +5,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>D:\webpublish\waste.ybhdmob.com - True|2021-05-28T05:59:02.2308877Z;True|2021-05-28T11:56:26.6796406+08:00;True|2021-05-28T11:28:00.4087907+08:00;True|2021-05-27T16:18:09.5993838+08:00;True|2021-05-27T16:07:31.3484951+08:00;True|2021-05-27T11:30:37.9119310+08:00;True|2021-05-27T11:28:35.5374674+08:00;True|2021-05-27T08:00:09.1625592+08:00;True|2021-05-26T20:42:17.0852150+08:00;True|2021-05-26T20:36:49.7527415+08:00;True|2021-05-25T17:57:31.8791293+08:00;True|2021-05-25T13:49:29.6488978+08:00;True|2021-05-25T13:48:24.6686105+08:00;True|2021-05-25T13:25:41.2512493+08:00;True|2021-05-24T17:55:33.3800078+08:00;True|2021-05-20T14:35:30.6957985+08:00;True|2021-05-20T13:17:22.6192995+08:00;True|2021-05-20T10:51:38.1268169+08:00;True|2021-05-19T19:50:03.7000224+08:00;True|2021-05-19T19:44:27.2518811+08:00;True|2021-05-19T19:43:26.5916681+08:00;True|2021-05-19T19:36:29.3197365+08:00;True|2021-05-19T19:30:00.3802430+08:00;True|2021-05-19T17:55:23.7939835+08:00;True|2021-05-19T11:05:17.9043392+08:00;True|2021-05-19T10:19:38.4839988+08:00;True|2021-05-19T10:17:19.7430612+08:00;True|2021-05-19T10:13:23.0031721+08:00;True|2021-05-19T10:06:03.9881599+08:00;True|2021-05-18T14:39:03.8876574+08:00;True|2021-05-18T14:23:46.9818836+08:00;True|2021-05-18T14:19:56.2382079+08:00;True|2021-05-18T11:29:53.5497590+08:00;True|2021-05-18T11:16:18.0123853+08:00;True|2021-05-17T18:59:52.4159105+08:00;True|2021-05-17T18:53:37.9438984+08:00;True|2021-05-17T18:48:14.9625161+08:00;True|2021-05-17T17:46:03.7723404+08:00;True|2021-05-17T17:14:20.2312990+08:00;True|2021-05-17T16:44:34.5837616+08:00;True|2021-05-17T16:25:20.1087804+08:00;True|2021-05-17T11:35:27.9388562+08:00; + True|2021-06-02T07:08:52.8245632Z;True|2021-06-02T15:05:50.3614099+08:00;True|2021-06-02T14:59:32.3690948+08:00;True|2021-06-02T14:10:25.1182836+08:00;True|2021-06-02T14:09:54.9215833+08:00;True|2021-06-01T10:41:54.9488501+08:00;True|2021-06-01T10:38:56.0283198+08:00;True|2021-05-28T13:59:02.2308877+08:00;True|2021-05-28T11:56:26.6796406+08:00;True|2021-05-28T11:28:00.4087907+08:00;True|2021-05-27T16:18:09.5993838+08:00;True|2021-05-27T16:07:31.3484951+08:00;True|2021-05-27T11:30:37.9119310+08:00;True|2021-05-27T11:28:35.5374674+08:00;True|2021-05-27T08:00:09.1625592+08:00;True|2021-05-26T20:42:17.0852150+08:00;True|2021-05-26T20:36:49.7527415+08:00;True|2021-05-25T17:57:31.8791293+08:00;True|2021-05-25T13:49:29.6488978+08:00;True|2021-05-25T13:48:24.6686105+08:00;True|2021-05-25T13:25:41.2512493+08:00;True|2021-05-24T17:55:33.3800078+08:00;True|2021-05-20T14:35:30.6957985+08:00;True|2021-05-20T13:17:22.6192995+08:00;True|2021-05-20T10:51:38.1268169+08:00;True|2021-05-19T19:50:03.7000224+08:00;True|2021-05-19T19:44:27.2518811+08:00;True|2021-05-19T19:43:26.5916681+08:00;True|2021-05-19T19:36:29.3197365+08:00;True|2021-05-19T19:30:00.3802430+08:00;True|2021-05-19T17:55:23.7939835+08:00;True|2021-05-19T11:05:17.9043392+08:00;True|2021-05-19T10:19:38.4839988+08:00;True|2021-05-19T10:17:19.7430612+08:00;True|2021-05-19T10:13:23.0031721+08:00;True|2021-05-19T10:06:03.9881599+08:00;True|2021-05-18T14:39:03.8876574+08:00;True|2021-05-18T14:23:46.9818836+08:00;True|2021-05-18T14:19:56.2382079+08:00;True|2021-05-18T11:29:53.5497590+08:00;True|2021-05-18T11:16:18.0123853+08:00;True|2021-05-17T18:59:52.4159105+08:00;True|2021-05-17T18:53:37.9438984+08:00;True|2021-05-17T18:48:14.9625161+08:00;True|2021-05-17T17:46:03.7723404+08:00;True|2021-05-17T17:14:20.2312990+08:00;True|2021-05-17T16:44:34.5837616+08:00;True|2021-05-17T16:25:20.1087804+08:00;True|2021-05-17T11:35:27.9388562+08:00; \ No newline at end of file diff --git a/Waste.Web.Entry/Waste.Web.Entry.csproj.user b/Waste.Web.Entry/Waste.Web.Entry.csproj.user index 71e401f..9f70d2e 100644 --- a/Waste.Web.Entry/Waste.Web.Entry.csproj.user +++ b/Waste.Web.Entry/Waste.Web.Entry.csproj.user @@ -3,6 +3,6 @@ RazorPageScaffolder root/Common/RazorPage - F:\liuzl_ybhdmob\Waste\Waste.Web.Entry\Properties\PublishProfiles\waste.ybhdmob.com.pubxml + E:\workspace_ybhdmob\Waste\Waste.Web.Entry\Properties\PublishProfiles\waste.ybhdmob.com.pubxml \ No newline at end of file diff --git a/Waste.Web.Entry/appsettings.json b/Waste.Web.Entry/appsettings.json index bf8caf6..e6a0d95 100644 --- a/Waste.Web.Entry/appsettings.json +++ b/Waste.Web.Entry/appsettings.json @@ -43,6 +43,7 @@ "ApiSecret": "1KXWKC1WA8V8eCDX", "ApiSecretHash": "5567485e9458ee89" }, + "IsTask": "false",//定时任务是否开启 "SoftName": "巨鼎物联网数字平台", //软件名称 "SecureKey": "ybhdmob_waste_2021", "SoftDesc": "", //软件描述