|
@@ -162,7 +162,7 @@ namespace Com.FirmLib.UI.BllCommon
|
|
|
public static SearchResultList<AssetShowItem> GetShowItems(string projectId,string localName,int startIndex)
|
|
|
{
|
|
|
SearchResultList<AssetShowItem> items = new SearchResultList<AssetShowItem>();
|
|
|
- ProjectSetting ps = new ProjectSetting(projectId) { Secret = "123" } ;
|
|
|
+ ProjectSetting ps = new ProjectSetting(projectId);
|
|
|
SearchLimit limit = new SearchLimit() { SkipCount = startIndex, GetCount = PerPageCount };
|
|
|
SearchFilter filter = new SearchFilter();
|
|
|
filter.AttachObject = new JObject();
|
|
@@ -175,7 +175,12 @@ namespace Com.FirmLib.UI.BllCommon
|
|
|
criteria.AttachObject.Add("id", projectId);
|
|
|
criteria.AttachObject.Add("family", JArray.FromObject(new List<string>()));
|
|
|
var originItems = BllFactory<PlatformBll>.Instance.GetAssetItems(ps, limit, filter,criteria);
|
|
|
- items.AddRange(originItems.Select(c => c.ConvertToShowItem()));
|
|
|
+ items.AddRange(originItems.Select(c =>
|
|
|
+ {
|
|
|
+ var item=c.ConvertToShowItem();
|
|
|
+ item.ProjectId = projectId;
|
|
|
+ return item;
|
|
|
+ }));
|
|
|
items.TotalCount = originItems.TotalCount;
|
|
|
return items;
|
|
|
}
|
|
@@ -188,7 +193,7 @@ namespace Com.FirmLib.UI.BllCommon
|
|
|
return true;
|
|
|
}
|
|
|
List<TdAssetItem> assetItems = items.Select(ConvertToAssetItem).ToList();
|
|
|
- ProjectSetting ps = new ProjectSetting(projectId) {Secret = "123"};
|
|
|
+ ProjectSetting ps = new ProjectSetting(projectId) ;
|
|
|
return BllFactory<PlatformBll>.Instance.UpdateAssetItems(ps, assetItems);
|
|
|
}
|
|
|
|
|
@@ -213,7 +218,7 @@ namespace Com.FirmLib.UI.BllCommon
|
|
|
public static bool DeleteAssets(string projectId, List<string> assetIds,List<string> parameterIds)
|
|
|
{
|
|
|
List<TdAssetItem> assetItems = new List<TdAssetItem>();
|
|
|
- ProjectSetting ps = new ProjectSetting(projectId) { Secret = "123" };
|
|
|
+ ProjectSetting ps = new ProjectSetting(projectId);
|
|
|
foreach (var assetId in assetIds)
|
|
|
{
|
|
|
TdAssetItem assetItem = new TdAssetItem();
|
|
@@ -243,7 +248,7 @@ namespace Com.FirmLib.UI.BllCommon
|
|
|
int startIndex,VenderItem item)
|
|
|
{
|
|
|
SearchResultList<AssetShowItem> items = new SearchResultList<AssetShowItem>();
|
|
|
- ProjectSetting ps = new ProjectSetting(projectId) { Secret = "123" };
|
|
|
+ ProjectSetting ps = new ProjectSetting(projectId);
|
|
|
SearchLimit limit = new SearchLimit() { SkipCount = startIndex, GetCount = PerPageCount+1 };
|
|
|
SearchFilter filter = new SearchFilter();
|
|
|
filter.AttachObject = new JObject();
|
|
@@ -257,7 +262,12 @@ namespace Com.FirmLib.UI.BllCommon
|
|
|
criteria.AttachObject.Add("venderType", item.Type);
|
|
|
criteria.AttachObject.Add("venderName", item.Name);
|
|
|
var originItems = BllFactory<PlatformBll>.Instance.GetRecomendAssetItems(ps, limit, filter, criteria);
|
|
|
- items.AddRange(originItems.Select(c => c.ConvertToShowItem()));
|
|
|
+ items.AddRange(originItems.Select(c =>
|
|
|
+ {
|
|
|
+ var tempItem = c.ConvertToShowItem();
|
|
|
+ tempItem.ProjectId = projectId;
|
|
|
+ return tempItem;
|
|
|
+ }));
|
|
|
items.TotalCount =startIndex+ items.Count;
|
|
|
if (items.Count>PerPageCount)
|
|
|
{
|
|
@@ -278,7 +288,7 @@ namespace Com.FirmLib.UI.BllCommon
|
|
|
public static SearchResultList<AssetShowItem> GetShowEqItems(string projectId, string localName, int startIndex)
|
|
|
{
|
|
|
SearchResultList<AssetShowItem> items = new SearchResultList<AssetShowItem>();
|
|
|
- ProjectSetting ps = new ProjectSetting(projectId) { Secret = "123" };
|
|
|
+ ProjectSetting ps = new ProjectSetting(projectId) ;
|
|
|
SearchLimit limit = new SearchLimit() { SkipCount = startIndex, GetCount = PerPageCount };
|
|
|
SearchFilter filter = new SearchFilter();
|
|
|
SearchCriteria criteria = new SearchCriteria();
|
|
@@ -290,6 +300,7 @@ namespace Com.FirmLib.UI.BllCommon
|
|
|
items.AddRange(originItems.Select(c =>
|
|
|
{
|
|
|
var item = c.ConvertToShowItem();
|
|
|
+ item.ProjectId = projectId;
|
|
|
item.FamilyCode = c.Category;
|
|
|
return item;
|
|
|
}));
|
|
@@ -306,7 +317,7 @@ namespace Com.FirmLib.UI.BllCommon
|
|
|
public static bool UpdateEqItems(string projectId, List<AssetShowItem> items)
|
|
|
{
|
|
|
List<TdAssetItem> assetItems = items.Select(ConvertToAssetItem).ToList();
|
|
|
- ProjectSetting ps = new ProjectSetting(projectId) { Secret = "123" };
|
|
|
+ ProjectSetting ps = new ProjectSetting(projectId) ;
|
|
|
return BllFactory<PlatformBll>.Instance.UpdateEquipmentItems(ps, assetItems);
|
|
|
}
|
|
|
/// <summary>
|
|
@@ -322,7 +333,7 @@ namespace Com.FirmLib.UI.BllCommon
|
|
|
parameterIds.Add(MBIBuiltInParameter.DPMaintainerID);
|
|
|
#endregion
|
|
|
List<TdAssetItem> assetItems = new List<TdAssetItem>();
|
|
|
- ProjectSetting ps = new ProjectSetting(projectId) { Secret = "123" };
|
|
|
+ ProjectSetting ps = new ProjectSetting(projectId) ;
|
|
|
foreach (var eqId in eqIds)
|
|
|
{
|
|
|
TdAssetItem assetItem = new TdAssetItem();
|