wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去除引用common.props

Browse Source
This commit is contained in:
潘飞
2023-11-06 19:35:59 +08:00
parent 6a2154edd9
commit c6b8dfc861
810 changed files with 3910 additions and 6695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/Tnb.Systems/System/BillRuleService.cs
View File

@@ -311,7 +311,7 @@ public class BillRuleService : IBillRullService, IDynamicApiController, ITransie
if (entity != null)
{
// 处理隔天流水号归0
if (entity.OutputNumber != null)
if (entity.OutputNumber != null)
{
var serialDate = entity.OutputNumber.Remove(entity.OutputNumber.Length - (int)entity.Digit).Replace(entity.Prefix, string.Empty);
var thisDate = entity.DateFormat == "no" ? string.Empty : DateTime.Now.ToString(entity.DateFormat);

18
system/Tnb.Systems/System/DataInterfaceService.cs
View File

@@ -4,7 +4,6 @@ using System.Security.Cryptography;
using System.Text;
using System.Text.RegularExpressions;
using System.Web;
using JNPF.ClayObject;
using JNPF.Common.Configuration;
using JNPF.Common.Const;
using JNPF.Common.Core.Manager;
@@ -521,7 +520,8 @@ public class DataInterfaceService : IDataInterfaceService, IDynamicApiController
if (interfaceOauthEntity == null) return null;
var ymDate = DateTime.Now.ParseToUnixTime().ToString();
var authorization = GetVerifySignature(interfaceOauthEntity, intefaceId, ymDate);
return new {
return new
{
YmDate = ymDate,
Authorization = authorization,
};
@@ -564,7 +564,7 @@ public class DataInterfaceService : IDataInterfaceService, IDynamicApiController
var result = await Preview(id, input);
if (result is DataTable)
{
List<Dictionary<string,Object>> list = JsonConvert.DeserializeObject<List<Dictionary<string, object>>>(JsonConvert.SerializeObject(result));
List<Dictionary<string, Object>> list = JsonConvert.DeserializeObject<List<Dictionary<string, object>>>(JsonConvert.SerializeObject(result));
return list.FirstOrDefault()?.Keys.ToList() ?? Enumerable.Empty<string>();
}
else
@@ -712,7 +712,8 @@ public class DataInterfaceService : IDataInterfaceService, IDynamicApiController
{
// 分页
var dt = GetPageToDataTable(resTable, input.currentPage, input.pageSize);
output = new {
output = new
{
pagination = new PageResult()
{
currentPage = input.currentPage,
@@ -759,7 +760,8 @@ public class DataInterfaceService : IDataInterfaceService, IDynamicApiController
// });
//}
resList = resList.FindAll(x => x.Where(xx => xx.Value != null && xx.Value.Contains(input.keyword)).Any());
output = new {
output = new
{
pagination = new PageResult()
{
currentPage = input.currentPage,
@@ -798,7 +800,8 @@ public class DataInterfaceService : IDataInterfaceService, IDynamicApiController
if (input.sort.Equals("desc")) resList = resList.OrderBy(x => x[input.sidx]).ToList();
else resList = resList.OrderByDescending(x => x[input.sidx]).ToList();
}
output = new {
output = new
{
pagination = new PageResult()
{
currentPage = input.currentPage,
@@ -810,7 +813,8 @@ public class DataInterfaceService : IDataInterfaceService, IDynamicApiController
}
else
{
output = new {
output = new
{
pagination = new PageResult()
{
currentPage = input.currentPage,

2
system/Tnb.Systems/System/DataSyncService.cs
View File

@@ -242,7 +242,7 @@ public class DataSyncService : IDynamicApiController, ITransient
fieldTypeList.Add("number", GetDataTypeList(3, dbTypeTo));
fieldTypeList.Add("number", GetDataTypeList(4, dbTypeTo));
fieldTypeList.Add("clob", GetDataTypeList(5, dbTypeTo));
break ;
break;
case "dm":
fieldTypeList.Add("varchar", GetDataTypeList(0, dbTypeTo));
fieldTypeList.Add("int", GetDataTypeList(1, dbTypeTo));

3
system/Tnb.Systems/System/DictionaryDataService.cs
View File

@@ -1,5 +1,4 @@
using JNPF.ClayObject.Extensions;
using JNPF.Common.Core.Manager;
using JNPF.Common.Core.Manager;
using JNPF.Common.Core.Manager.Files;
using JNPF.Common.Enums;
using JNPF.Common.Manager;

2
system/Tnb.Systems/System/InterfaceOauthService.cs
View File

@@ -22,7 +22,7 @@ namespace JNPF.Systems.System;
/// 接口认证
/// 版 本：V3.2
/// 版 权：拓通智联科技有限公司（http://www.tuotong-tech.com）
/// 日 期：2021-06-01.
/// 日 期：2021-06-01.
/// </summary>
[ApiDescriptionSettings(Tag = "System", Name = "InterfaceOauth", Order = 202)]
[Route("api/system/[controller]")]

9
system/Tnb.Systems/System/ModuleColumnService.cs
View File

@@ -12,7 +12,6 @@ using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System;
using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev.Engine;
using JNPF.VisualDev.Engine.Core;
using JNPF.VisualDev.Entitys;
using Mapster;
using Microsoft.AspNetCore.Mvc;
@@ -74,7 +73,7 @@ public class ModuleColumnService : IModuleColumnService, IDynamicApiController,
fullName = a.FullName,
enCode = SqlFunc.IF(a.FieldRule == 1 && !SqlFunc.IsNullOrEmpty(a.BindTable)).Return(a.EnCode.Replace("jnpf_" + a.BindTable + "_jnpf_", ""))
.ElseIF(b.Type == 3 && a.FieldRule == 1).Return(a.EnCode.Replace(a.BindTable + ".", ""))
.ElseIF(a.FieldRule == 2).Return(a.EnCode.Replace(a.ChildTableKey+"-", "")).End(a.EnCode),
.ElseIF(a.FieldRule == 2).Return(a.EnCode.Replace(a.ChildTableKey + "-", "")).End(a.EnCode),
id = a.Id,
sortCode = a.SortCode
}).ToListAsync();
@@ -91,7 +90,7 @@ public class ModuleColumnService : IModuleColumnService, IDynamicApiController,
{
var data = await _repository.GetFirstAsync(x => x.Id == id && x.DeleteMark == null);
if (data.FieldRule == 2 && data.ChildTableKey.IsNotEmptyOrNull())
data.EnCode = data.EnCode.Replace(data.ChildTableKey+"-", string.Empty);
data.EnCode = data.EnCode.Replace(data.ChildTableKey + "-", string.Empty);
var menu = await _repository.AsSugarClient().Queryable<ModuleEntity>().FirstAsync(x => x.Id == data.ModuleId && x.DeleteMark == null);
if (menu.IsNotEmptyOrNull() && data.BindTable.IsNotEmptyOrNull() && data.FieldRule == 1)
{
@@ -138,7 +137,7 @@ public class ModuleColumnService : IModuleColumnService, IDynamicApiController,
{
var entity = input.Adapt<ModuleColumnEntity>();
if (entity.FieldRule == 2 && input.childTableKey.IsNotEmptyOrNull())
entity.EnCode = input.childTableKey +"-"+ entity.EnCode;
entity.EnCode = input.childTableKey + "-" + entity.EnCode;
var menu = await _repository.AsSugarClient().Queryable<ModuleEntity>().FirstAsync(x => x.Id == input.moduleId && x.DeleteMark == null);
if (menu.IsNotEmptyOrNull() && entity.BindTable.IsNotEmptyOrNull() && entity.FieldRule == 1)
{
@@ -236,7 +235,7 @@ public class ModuleColumnService : IModuleColumnService, IDynamicApiController,
entity.FullName = item.fullName;
entity.BindTable = item.bindTable;
entity.FieldRule = item.fieldRule;
entity.ChildTableKey=item.childTableKey;
entity.ChildTableKey = item.childTableKey;
entity.SortCode = 0;
if (entity.FieldRule == 2 && item.childTableKey.IsNotEmptyOrNull())
entity.EnCode = item.childTableKey + "-" + entity.EnCode;

1
system/Tnb.Systems/System/ModuleDataAuthorizeService.cs
View File

@@ -10,7 +10,6 @@ using JNPF.Systems.Entitys.Dto.ModuleDataAuthorize;
using JNPF.Systems.Entitys.Dto.ModuleDataAuthorizeScheme;
using JNPF.Systems.Entitys.System;
using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev.Engine;
using JNPF.VisualDev.Engine.Core;
using JNPF.VisualDev.Entitys;
using Mapster;

1
system/Tnb.Systems/System/ModuleFormService.cs
View File

@@ -12,7 +12,6 @@ using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System;
using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev.Engine;
using JNPF.VisualDev.Engine.Core;
using JNPF.VisualDev.Entitys;
using Mapster;
using Microsoft.AspNetCore.Mvc;

5
system/Tnb.Systems/System/MonitorService.cs
View File

@@ -1,10 +1,9 @@
using JNPF.Common.Security;
using System.Runtime.InteropServices;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.Systems.Entitys.Dto.Monitor;
using JNPF.Systems.Interfaces.System;
using Microsoft.AspNetCore.Mvc;
using System.Runtime.InteropServices;
namespace JNPF.Systems;

10
system/Tnb.Systems/System/PrintDevService.cs
View File

@@ -90,9 +90,9 @@ public class PrintDevService : IDynamicApiController, ITransient
[HttpGet("")]
public async Task<dynamic> GetList_Api([FromQuery] PrintDevListInput input)
{
var list = await _repository.AsSugarClient().Queryable<PrintDevEntity, UserEntity, UserEntity, DictionaryTypeEntity,DictionaryDataEntity>((a, b, c, d,e) =>
new JoinQueryInfos(JoinType.Left, b.Id == a.CreatorUserId, JoinType.Left, c.Id == a.LastModifyUserId,JoinType.Left,d.EnCode=="printDev", JoinType.Left, a.Category == e.EnCode && d.Id==e.DictionaryTypeId))
.Where((a, b, c, d,e) => a.DeleteMark == null )
var list = await _repository.AsSugarClient().Queryable<PrintDevEntity, UserEntity, UserEntity, DictionaryTypeEntity, DictionaryDataEntity>((a, b, c, d, e) =>
new JoinQueryInfos(JoinType.Left, b.Id == a.CreatorUserId, JoinType.Left, c.Id == a.LastModifyUserId, JoinType.Left, d.EnCode == "printDev", JoinType.Left, a.Category == e.EnCode && d.Id == e.DictionaryTypeId))
.Where((a, b, c, d, e) => a.DeleteMark == null)
.WhereIF(input.category.IsNotEmptyOrNull(), a => a.Category == input.category)
.WhereIF(input.keyword.IsNotEmptyOrNull(), a => a.FullName.Contains(input.keyword) || a.EnCode.Contains(input.keyword))
.OrderBy(a => a.SortCode).OrderBy(a => a.CreatorTime, OrderByType.Desc)
@@ -120,10 +120,10 @@ public class PrintDevService : IDynamicApiController, ITransient
[HttpGet("Selector")]
public async Task<dynamic> GetList_Api([FromQuery] string type)
{
var list = await _repository.AsSugarClient().Queryable<PrintDevEntity, UserEntity, UserEntity, DictionaryTypeEntity,DictionaryDataEntity>((a, b, c, d,e) => new JoinQueryInfos(JoinType.Left, b.Id == a.CreatorUserId, JoinType.Left, c.Id == a.LastModifyUserId, JoinType.Left, d.EnCode=="printDev", JoinType.Left, a.Category == e.EnCode && d.Id==e.DictionaryTypeId))
var list = await _repository.AsSugarClient().Queryable<PrintDevEntity, UserEntity, UserEntity, DictionaryTypeEntity, DictionaryDataEntity>((a, b, c, d, e) => new JoinQueryInfos(JoinType.Left, b.Id == a.CreatorUserId, JoinType.Left, c.Id == a.LastModifyUserId, JoinType.Left, d.EnCode == "printDev", JoinType.Left, a.Category == e.EnCode && d.Id == e.DictionaryTypeId))
.Where((a, b, c, d) => a.DeleteMark == null && a.EnabledMark == 1).OrderBy(a => a.SortCode).OrderBy(a => a.CreatorTime, OrderByType.Desc)
.WhereIF(type.IsNotEmptyOrNull(), (a) => a.Type == type.ParseToInt())
.Select((a, b, c, d,e) => new PrintDevListOutput
.Select((a, b, c, d, e) => new PrintDevListOutput
{
category = a.Category,
id = a.Id,

4
system/Tnb.Systems/System/PrintLogService.cs
View File

@@ -1,5 +1,6 @@
using JNPF.Common.Core.Manager;
using JNPF.Common.Enums;
using JNPF.Common.Extension;
using JNPF.Common.Filter;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
@@ -12,7 +13,6 @@ using JNPF.Systems.Entitys.Permission;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using JNPF.Common.Extension;
namespace JNPF.Systems.System;
@@ -94,7 +94,7 @@ public class PrintLogService : IDynamicApiController, ITransient
public async Task Delete([FromBody] PrintLogOutuut input)
{
var entity = input.Adapt<PrintLogEntity>();
entity.Id= SnowflakeIdHelper.NextId();
entity.Id = SnowflakeIdHelper.NextId();
entity.PrintMan = _userManager.UserId;
entity.PrintTime = DateTime.Now;
var isOk = await _repository.AsInsertable(entity).ExecuteCommandAsync();

1
system/Tnb.Systems/System/ProvinceService.cs
View File

@@ -6,7 +6,6 @@ using JNPF.DynamicApiController;
using JNPF.FriendlyException;
using JNPF.Systems.Entitys.Dto.Province;
using JNPF.Systems.Entitys.System;
using JNPF.Systems.Interfaces.System;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;

4
system/Tnb.Systems/System/SysLogService.cs
View File

@@ -1,4 +1,5 @@
using JNPF.Common.Extension;
using System.Reflection;
using JNPF.Common.Extension;
using JNPF.Common.Filter;
using JNPF.DatabaseAccessor;
using JNPF.DependencyInjection;
@@ -10,7 +11,6 @@ using JNPF.Systems.Entitys.System;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using System.Reflection;
namespace JNPF.Systems;

4
system/Tnb.Systems/System/SystemService.cs
View File

@@ -1,10 +1,8 @@
using Aop.Api.Domain;
using JNPF.Common.Const;
using JNPF.Common.Const;
using JNPF.Common.Core.Handlers;
using JNPF.Common.Core.Manager;
using JNPF.Common.Enums;
using JNPF.Common.Extension;
using JNPF.Common.Filter;
using JNPF.Common.Manager;
using JNPF.Common.Models.User;
using JNPF.Common.Security;