diff --git a/IronIntelContractorBusiness/Maintenance/FuelRecordInfo.cs b/IronIntelContractorBusiness/Maintenance/FuelRecordInfo.cs index 3e50a87..c56bd5b 100644 --- a/IronIntelContractorBusiness/Maintenance/FuelRecordInfo.cs +++ b/IronIntelContractorBusiness/Maintenance/FuelRecordInfo.cs @@ -17,6 +17,7 @@ namespace IronIntel.Contractor.Maintenance public string FuelTypeName { get; set; } public string FuelType { get; set; } public double Odomerter { get; set; } + public string OdometerUnits { get; set; } public string RetailerZip { get; set; } public string RetailerState { get; set; } public string RetailerCity { get; set; } diff --git a/IronIntelContractorBusiness/Properties/AssemblyInfo.cs b/IronIntelContractorBusiness/Properties/AssemblyInfo.cs index 87558a7..33dbb87 100644 --- a/IronIntelContractorBusiness/Properties/AssemblyInfo.cs +++ b/IronIntelContractorBusiness/Properties/AssemblyInfo.cs @@ -33,4 +33,4 @@ using System.Runtime.InteropServices; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("2.20.430")] +[assembly: AssemblyFileVersion("2.20.525")] diff --git a/IronIntelContractorBusiness/Users/AppModulesManagement.cs b/IronIntelContractorBusiness/Users/AppModulesManagement.cs index 464559d..9c14893 100644 --- a/IronIntelContractorBusiness/Users/AppModulesManagement.cs +++ b/IronIntelContractorBusiness/Users/AppModulesManagement.cs @@ -7,6 +7,7 @@ using System.Data; using Foresight.Data; using IronIntel.Contractor.Users; using IronIntel.Services; +using Foresight.Fleet.Services.User; namespace IronIntel.Contractor.Users { @@ -15,70 +16,38 @@ namespace IronIntel.Contractor.Users private const string FITracker = "FITracker"; private const string Inspect = "Inspection"; private const string TeamIntelligence = "TeamIntelligence"; + private const string FilterQ = "FilterQ"; + public static AppModuleInfo[] GetAvailableAppModuleInfos(UserInfo user) { - const string SQL = @"select ID,APPMODULENAME,APPMODULEDESC,URL,ICONPATH,BACKCOLOR,FORECOLOR,OPENINNEWWINDOW from APPMODULES where VISIBLE>0 and (isnull(SITETYPE,'All')='All' or SITETYPE={0}) "; - - if (user == null) - { - return new AppModuleInfo[0]; - } - - string sql = SQL; - switch (user.UserType) - { - case UserTypes.Readonly: - sql = SQL + " and SECURITYLEVEL=0"; - break; - case UserTypes.Common: - sql = SQL + " and SECURITYLEVEL<=1"; - break; - case UserTypes.Admin: - sql = SQL + " and SECURITYLEVEL<=2"; - break; - case UserTypes.SupperAdmin: - sql = SQL + " and SECURITYLEVEL<=3"; - break; - default: - sql = SQL; - break; - } - - sql = sql + " order by ORDERINDEX "; - - FIDbAccess db = SystemParams.GetDbInstance(); - DataTable dt = db.GetDataTableBySQL(sql, SystemParams.CustomerDetail.CustomerType); - CustUIStyle style = SystemParams.GetUIStyle(user.IID);//获取样式设置 string moudleBackgroundColor = "#0078D7"; if (style != null && !string.IsNullOrEmpty(style.MenuBackgroundColor)) moudleBackgroundColor = style.MenuBackgroundColor; List list = new List(); - bool fitracter = SystemParams.HasLicense(FITracker); - bool inspect = SystemParams.HasLicense(Inspect); - bool teamintelligence = SystemParams.HasLicense(TeamIntelligence); - foreach (DataRow dr in dt.Rows) + + var pc = FleetServiceClientHelper.CreateClient(); + FeatureModule[] ms = pc.GetAvailableModules(SystemParams.CompanyID, user.IID); + List moudles = new List(); + moudles.AddRange(ms); + if (ms.FirstOrDefault(m => m.Id == FeatureModule.MODULE_MAPVIEW) == null) + moudles.Insert(0, FeatureModule.Modules[0]); + foreach (var m in moudles) { - AppModuleInfo ami = ConvertToAppModule(dr); - ami.BackColor = moudleBackgroundColor; - if (ami.ID.Equals(FITracker, StringComparison.OrdinalIgnoreCase)) - { - if (fitracter) - list.Add(ami); - } - else if (ami.ID.Equals(Inspect, StringComparison.OrdinalIgnoreCase)) - { - if (inspect) - list.Add(ami); - } - else if (ami.ID.Equals(TeamIntelligence, StringComparison.OrdinalIgnoreCase)) - { - if (teamintelligence) - list.Add(ami); - } - else - list.Add(ami); + AppModuleInfo ami = new AppModuleInfo(); + ami.ID = m.Id.ToString(); + ami.Name = m.Name; + ami.Description = m.Description; + ami.Url = m.Url; + ami.IconPath = m.IconPath; + ami.BackColor = m.BackgroundColor; + ami.ForeColor = m.ForeColor; + ami.OpenInNewWindow = false; + ami.Visible = true; + ami.ModuleType = AppModuleType.System; + + list.Add(ami); } AppModuleInfo[] wsps = GetFICWorkspace(user); foreach (AppModuleInfo ap in wsps) diff --git a/IronIntelContractorBusiness/Users/UserInfo.cs b/IronIntelContractorBusiness/Users/UserInfo.cs index 29c50df..6ff9e09 100644 --- a/IronIntelContractorBusiness/Users/UserInfo.cs +++ b/IronIntelContractorBusiness/Users/UserInfo.cs @@ -32,6 +32,9 @@ namespace IronIntel.Contractor.Users public decimal HourlyRate { get; set; } public string[] GroupIDs { get; set; } public string[] GroupNames { get; set; } + public bool AllowLoginIntoPC { get; set; } + public bool AllowLoginIntoInspectMobile { get; set; } + public bool AllowLoginIntoFleetMobile { get; set; } public string GroupNamesStr { get { return (GroupNames == null || GroupNames.Length == 0) ? "" : string.Join(",", GroupNames); } } public string ContactTypeName diff --git a/IronIntelContractorBusiness/Users/UserManagement.cs b/IronIntelContractorBusiness/Users/UserManagement.cs index b703781..16f56fd 100644 --- a/IronIntelContractorBusiness/Users/UserManagement.cs +++ b/IronIntelContractorBusiness/Users/UserManagement.cs @@ -109,6 +109,9 @@ namespace IronIntel.Contractor.Users u.TeamIntelligenceUser = user.TeamIntelligenceUser; u.FOB = user.FOB; u.HourlyRate = user.HourlyRate; + u.AllowLoginIntoPC = user.AllowLoginIntoPC; + u.AllowLoginIntoFleetMobile = user.AllowLoginIntoFleetMobile; + u.AllowLoginIntoInspectMobile = user.AllowLoginIntoInspectMobile; return u; } @@ -135,6 +138,9 @@ namespace IronIntel.Contractor.Users u.TeamIntelligenceUser = user.TeamIntelligenceUser; u.FOB = user.FOB; u.HourlyRate = user.HourlyRate; + u.AllowLoginIntoPC = user.AllowLoginIntoPC; + u.AllowLoginIntoFleetMobile = user.AllowLoginIntoFleetMobile; + u.AllowLoginIntoInspectMobile = user.AllowLoginIntoInspectMobile; return u; } diff --git a/IronIntelContractorSiteLib/Asset/AssetBasePage.cs b/IronIntelContractorSiteLib/Asset/AssetBasePage.cs index daf0984..336b232 100644 --- a/IronIntelContractorSiteLib/Asset/AssetBasePage.cs +++ b/IronIntelContractorSiteLib/Asset/AssetBasePage.cs @@ -3,6 +3,7 @@ using Foresight.Fleet.Services; using Foresight.Fleet.Services.Asset; using Foresight.Fleet.Services.AssetHealth; using Foresight.Fleet.Services.Device; +using Foresight.Fleet.Services.User; using Foresight.ServiceModel; using IronIntel.Contractor.Machines; using IronIntel.Contractor.Maintenance; @@ -189,6 +190,8 @@ namespace IronIntel.Contractor.Site.Asset var session = GetCurrentLoginSession(); if (session != null) { + if (!CheckRight(SystemParams.CompanyID, Foresight.Fleet.Services.User.Feature.MANAGE_ASSETS)) + return ""; string clientdata = HttpUtility.HtmlDecode(Request.Params["ClientData"]); AssetDetailItem2 asset = JsonConvert.DeserializeObject(clientdata); @@ -216,7 +219,8 @@ namespace IronIntel.Contractor.Site.Asset var oldMachine = client.GetAssetDetailInfo2(customerid, asset.ID); asset.EngineHours = oldMachine.EngineHours;//EngineHours单独保存 var user = UserManagement.GetUserByIID(session.User.UID); - if (user.UserType < UserTypes.Admin) + bool permission = CheckRight(SystemParams.CompanyID, Feature.MANAGE_ASSETS); + if (!permission) { asset.VIN = oldMachine.VIN; asset.MakeID = oldMachine.MakeID; diff --git a/IronIntelContractorSiteLib/ContractorBasePage.cs b/IronIntelContractorSiteLib/ContractorBasePage.cs index fbb459c..0bb6bae 100644 --- a/IronIntelContractorSiteLib/ContractorBasePage.cs +++ b/IronIntelContractorSiteLib/ContractorBasePage.cs @@ -10,6 +10,7 @@ using IronIntel.Contractor.Users; using IronIntel.Services.Customers; using System.Web; using Foresight.Fleet.Services; +using Foresight.Fleet.Services.User; namespace IronIntel.Contractor.Site { @@ -65,7 +66,7 @@ namespace IronIntel.Contractor.Site { return false; } - return (user.UserType == UserTypes.Admin || user.UserType == UserTypes.SupperAdmin); + return (user.UserType == Users.UserTypes.Admin || user.UserType == Users.UserTypes.SupperAdmin); } } @@ -94,12 +95,59 @@ namespace IronIntel.Contractor.Site protected virtual bool ThrowIfNotAllowed { get { return false; } } + protected virtual bool CanDirectAccess { get { return false; } } + + protected bool CheckUserToken() + { + var session = GetCurrentLoginSession(); + if (session != null)//已经登录 + { + return true; + } + string tkstring = Request.Params["tk"]; + if (string.IsNullOrEmpty(tkstring)) + return false; + + try + { + var sc = new FI.FIC.Models.Security.SymmetricCrypt(FI.FIC.Models.Security.CryptType.DES); + tkstring = sc.Decrypt(tkstring, + FI.FIC.DataProviders.ChartDataProvider.DES_Key, + FI.FIC.DataProviders.ChartDataProvider.DES_IV); + + string[] temps = tkstring.Split('|'); + if (temps.Length != 2) + return false; + + string timestring = temps[0]; + DateTime time = DateTime.MinValue; + if (!DateTime.TryParse(timestring, out time) + || time < DateTime.UtcNow.AddMinutes(-5)) + return false; + + var sessionid = temps[1]; + var c = CreateClient(); + //通过手机SessionID获取新的Web Session + var newsession = c.GetNewLoginSession(sessionid, APPNAME); + SetLoginSessionCookie(newsession.SessionID); + } + catch (Exception ex) + { + return false; + } + + return true; + } + protected bool CheckLoginSession() { var session = GetCurrentLoginSession(); if (session == null) { - RedirectToLoginPage(); + if (CanDirectAccess) + RedirectToLoginPageWithUrl(); + else + RedirectToLoginPage(); return false; } if (!AllowCurrentLoginSessionEnter()) @@ -121,6 +169,13 @@ namespace IronIntel.Contractor.Site return true; } + protected void RedirectToLoginPageWithUrl() + { + string url = Request.Url.ToString(); + url = HttpUtility.UrlEncode(url); + Response.Redirect(LoginPageUrl + "?f=" + url); + } + protected void DoLogout() { string sid = null; @@ -213,5 +268,28 @@ namespace IronIntel.Contractor.Site var session = GetCurrentLoginSession(); return FleetServiceClientHelper.CreateClient(companyid, session == null ? "" : session.SessionID); } + + protected bool CheckRight(string custid, int featureid) + { + var user = GetCurrentUser(); + if (user == null) + return false; + + if (user.UserType == Users.UserTypes.SupperAdmin) + return true; + + if (user.UserType == Users.UserTypes.Common || user.UserType == Users.UserTypes.Admin) + { + var client = FleetServiceClientHelper.CreateClient(); + Tuple[] pmss = client.GetUserPermissions(custid, user.IID); + if (pmss.Length > 0) + { + Tuple permission = pmss.FirstOrDefault(m => m.Item1.Id == featureid); + if (permission != null) + return true; + } + } + return false; + } } } diff --git a/IronIntelContractorSiteLib/InspectionBasePage.cs b/IronIntelContractorSiteLib/InspectionBasePage.cs index 7e355ed..5d6f855 100644 --- a/IronIntelContractorSiteLib/InspectionBasePage.cs +++ b/IronIntelContractorSiteLib/InspectionBasePage.cs @@ -1,6 +1,7 @@ using Foresight.Fleet.Services.Asset; using Foresight.Fleet.Services.AssetHealth; using Foresight.Fleet.Services.Inspection; +using Foresight.Fleet.Services.User; using Foresight.ServiceModel; using IronIntel.Contractor.FilterQ; using IronIntel.Contractor.Machines; @@ -151,6 +152,29 @@ namespace IronIntel.Contractor.Site Response.End(); } + protected object GetInspectItem(string inspectionid) + {//只有id，不知道类型 + var sesstion = GetCurrentLoginSession(); + + AssetInspectClient aclient = CreateClient(); + AssetInspectItem aitem = aclient.GetInspectItem(SystemParams.CompanyID, inspectionid, sesstion.User.UID); + if (aitem != null) + { + if (!CheckRight(SystemParams.CompanyID, Foresight.Fleet.Services.User.Feature.INSPECTION_REPORTS)) + return null; + else + return aitem; + } + + TeamIntelligenceClient tclient = CreateClient(); + TeamInspectItem titem = tclient.GetInspectItem(SystemParams.CompanyID, inspectionid, sesstion.User.UID); + + if (!CheckRight(SystemParams.CompanyID, Foresight.Fleet.Services.User.Feature.TEAM_REPORTS)) + return null; + else + return titem; + } + private object GetInspectItems() { try @@ -469,25 +493,26 @@ namespace IronIntel.Contractor.Site { foreach (var q in s.Questions) { + var qType =ConvertQuestionType(q); foreach (var a in ir.Answers) { if (q.Id.Equals(a.QuestionId, StringComparison.OrdinalIgnoreCase)) { - if (q.QuestionType == QuestionTypes.Date || q.QuestionType == QuestionTypes.DateAndTime) + if (qType == QuestionTypes.Date || qType == QuestionTypes.DateAndTime) { DateTime dt = DateTime.Now; if (DateTime.TryParse(a.Result, out dt)) { - if (q.QuestionType == QuestionTypes.Date) + if (qType == QuestionTypes.Date) a.Result = dt.ToString("M/d/yyyy tt"); - else if (q.QuestionType == QuestionTypes.DateAndTime) + else if (qType == QuestionTypes.DateAndTime) a.Result = dt.ToString("M/d/yyyy h:mm:ss tt"); } } - else if (q.QuestionType == QuestionTypes.Number - || q.QuestionType == QuestionTypes.Integer - || q.QuestionType == QuestionTypes.EngingHours - || q.QuestionType == QuestionTypes.Odometer) + else if (qType == QuestionTypes.Number + || qType == QuestionTypes.Integer + || qType == QuestionTypes.EngingHours + || qType == QuestionTypes.Odometer) { double tn = 0; if (double.TryParse(a.Result, out tn)) @@ -495,13 +520,13 @@ namespace IronIntel.Contractor.Site } //IdentifiedQuestion - if (q.QuestionType != QuestionTypes.DropDown - && q.QuestionType != QuestionTypes.YesOrNo - && q.QuestionType != QuestionTypes.List) + if (qType != QuestionTypes.DropDown + && qType != QuestionTypes.YesOrNo + && qType != QuestionTypes.List) { if (a.SeverityLevel != SeverityLeveles.None) { - if (q.QuestionType == QuestionTypes.Picture) + if (qType == QuestionTypes.Picture) { var ms = ir.Medias.FirstOrDefault(m => m.AnswerId.ToString() == a.Id.ToString()); if (ms == null) @@ -571,6 +596,37 @@ namespace IronIntel.Contractor.Site } } + private QuestionTypes ConvertQuestionType(Question q) + { + var questionType = q.QuestionType; + if (questionType == QuestionTypes.FuelRecords) + { + switch (q.SubType) + { + case (int)FuelRecordTypes.TransactionDate: + questionType = QuestionTypes.DateAndTime; + break; + case (int)FuelRecordTypes.Odometer: + case (int)FuelRecordTypes.Quantity: + case (int)FuelRecordTypes.UnitCost: + case (int)FuelRecordTypes.TotalCost: + questionType = QuestionTypes.Odometer; + break; + case (int)FuelRecordTypes.FuelType: + case (int)FuelRecordTypes.State: + questionType = QuestionTypes.DropDown; + break; + case (int)FuelRecordTypes.Picture: + questionType = QuestionTypes.Picture; + break; + default: + break; + } + } + + return questionType; + } + private byte[] GetInspectionPDF(out string fileName) { fileName = ""; @@ -768,8 +824,25 @@ namespace IronIntel.Contractor.Site FormTemplateInfo templateinfo = JsonConvert.DeserializeObject(HttpUtility.HtmlDecode(data)); var user = UserManagement.GetUserByIID(session.User.UID); - if (user.UserType != UserTypes.SupperAdmin && user.UserType != UserTypes.Admin) + if (user.UserType == Users.UserTypes.Readonly) return ""; + else if (user.UserType == Users.UserTypes.Common) + { + var pc = FleetServiceClientHelper.CreateClient(); + Tuple[] pmss = pc.GetUserPermissions(SystemParams.CompanyID, user.IID); + if (pmss.Length > 0) + { + int pkey = teamintelligence ? Feature.TEAM_TEMPLATES : Feature.INSPECTION_TEMPLATES; + Tuple pm = pmss.FirstOrDefault(m => m.Item1.Id == pkey); + if (pm.Equals(default(KeyValuePair)) + || pm.Item2 != Permissions.FullControl) + { + return ""; + } + } + else + return ""; + } if (templateinfo != null) { diff --git a/IronIntelContractorSiteLib/MachineDeviceBasePage.cs b/IronIntelContractorSiteLib/MachineDeviceBasePage.cs index 96a5b63..662bdec 100644 --- a/IronIntelContractorSiteLib/MachineDeviceBasePage.cs +++ b/IronIntelContractorSiteLib/MachineDeviceBasePage.cs @@ -574,6 +574,9 @@ namespace IronIntel.Contractor.Site var session = GetCurrentLoginSession(); if (session != null) { + if (!CheckRight(SystemParams.CompanyID, Foresight.Fleet.Services.User.Feature.MANAGE_DEVICES)) + return ""; + var clientdata = Request.Form["ClientData"]; var data = HttpUtility.HtmlDecode(clientdata); DeviceItem deviceitem = JsonConvert.DeserializeObject(data); @@ -935,6 +938,8 @@ namespace IronIntel.Contractor.Site { if (GetCurrentLoginSession() != null) { + if (!CheckRight(SystemParams.CompanyID, Foresight.Fleet.Services.User.Feature.MANAGE_ASSETS)) + return ""; string clientdata = Request.Form["ClientData"]; clientdata = HttpUtility.HtmlDecode(clientdata); MachineGroup mg = JsonConvert.DeserializeObject(clientdata); @@ -1325,7 +1330,8 @@ namespace IronIntel.Contractor.Site try { var user = GetCurrentUser(); - if (user != null) + bool permission = CheckRight(SystemParams.CompanyID, Feature.MANAGE_ASSETS); + if (user != null && (user.UserType == Users.UserTypes.SupperAdmin || user.UserType == Users.UserTypes.Admin)) { string clientdata = Request.Form["ClientData"]; clientdata = HttpUtility.HtmlDecode(clientdata); @@ -1804,7 +1810,8 @@ namespace IronIntel.Contractor.Site bool isallowed = false; if (!loginsession.User.IsForesightUser) - isallowed = UserManagement.CheckUserPermission(loginsession.SessionID, loginsession.User.UID, 20); + isallowed = CheckRight(SystemParams.CompanyID, Foresight.Fleet.Services.User.Feature.ASSET_ATTRIBUTE_ADJUSTMENT); + //isallowed = UserManagement.CheckUserPermission(loginsession.SessionID, loginsession.User.UID, 20); if (loginsession.User.IsForesightUser || isallowed) CreateClient(odo.CustomerID).AdjustOdometer(odo.CustomerID, odo.AssetID, localtime, utctime, odo.Odometer, odo.UOM, odo.Notes, loginsession.User.UID); @@ -1838,7 +1845,8 @@ namespace IronIntel.Contractor.Site bool isallowed = false; if (!loginsession.User.IsForesightUser) - isallowed = UserManagement.CheckUserPermission(loginsession.SessionID, loginsession.User.UID, 20); + isallowed = CheckRight(SystemParams.CompanyID, Foresight.Fleet.Services.User.Feature.ASSET_ATTRIBUTE_ADJUSTMENT); + //isallowed = UserManagement.CheckUserPermission(loginsession.SessionID, loginsession.User.UID, 20); if (loginsession.User.IsForesightUser || isallowed) CreateClient(odo.CustomerID).AddManuallyInputOdometer(odo.CustomerID, odo.AssetID, loginsession.User.UID, odo.Odometer, odo.UOM, utctime, odo.Notes); @@ -2057,7 +2065,8 @@ namespace IronIntel.Contractor.Site bool isallowed = false; if (!loginsession.User.IsForesightUser) - isallowed = UserManagement.CheckUserPermission(loginsession.SessionID, loginsession.User.UID, 20); + isallowed = CheckRight(SystemParams.CompanyID, Foresight.Fleet.Services.User.Feature.ASSET_ATTRIBUTE_ADJUSTMENT); + //isallowed = UserManagement.CheckUserPermission(loginsession.SessionID, loginsession.User.UID, 20); if (loginsession.User.IsForesightUser || isallowed) CreateClient(eng.CustomerID).AdjustEngineHours(eng.CustomerID, eng.AssetID, localtime, utctime, eng.EngineHours, eng.Notes, loginsession.User.UID); return "OK"; @@ -2090,7 +2099,8 @@ namespace IronIntel.Contractor.Site bool isallowed = false; if (!loginsession.User.IsForesightUser) - isallowed = UserManagement.CheckUserPermission(loginsession.SessionID, loginsession.User.UID, 20); + isallowed = CheckRight(SystemParams.CompanyID, Foresight.Fleet.Services.User.Feature.ASSET_ATTRIBUTE_ADJUSTMENT); + //isallowed = UserManagement.CheckUserPermission(loginsession.SessionID, loginsession.User.UID, 20); if (loginsession.User.IsForesightUser || isallowed) CreateClient(eng.CustomerID).AddManuallyInputEngineHours(eng.CustomerID, eng.AssetID, loginsession.User.UID, eng.EngineHours, utctime, eng.Notes); return "OK"; @@ -2235,7 +2245,8 @@ namespace IronIntel.Contractor.Site bool isallowed = false; if (!loginsession.User.IsForesightUser) - isallowed = UserManagement.CheckUserPermission(loginsession.SessionID, loginsession.User.UID, 20); + isallowed = CheckRight(SystemParams.CompanyID, Foresight.Fleet.Services.User.Feature.ASSET_ATTRIBUTE_ADJUSTMENT); + //isallowed = UserManagement.CheckUserPermission(loginsession.SessionID, loginsession.User.UID, 20); if (loginsession.User.IsForesightUser || isallowed) { if (item.Type == 0) @@ -2394,7 +2405,8 @@ namespace IronIntel.Contractor.Site bool result = false; if (session != null) { - result = UserManagement.CheckUserPermission(session.SessionID, session.User.UID, 20); + result = CheckRight(SystemParams.CompanyID, Foresight.Fleet.Services.User.Feature.ASSET_ATTRIBUTE_ADJUSTMENT); + //result = UserManagement.CheckUserPermission(session.SessionID, session.User.UID, 20); } return result; } diff --git a/IronIntelContractorSiteLib/MainBasePage.cs b/IronIntelContractorSiteLib/MainBasePage.cs index 94feb86..fd93b2f 100644 --- a/IronIntelContractorSiteLib/MainBasePage.cs +++ b/IronIntelContractorSiteLib/MainBasePage.cs @@ -58,25 +58,25 @@ namespace IronIntel.Contractor.Site if (session != null) { List list = Acl.GetAvailableAppModuleInfos(session.User.UID).ToList(); - LicenseInfo license = SystemParams.GetLicense(); - if (license != null && license.Items.Count > 0) - { - LicenseItem lijl = license.Items.FirstOrDefault(m => m.Key == "JOBSITELIMIT"); - if (lijl == null || !Helper.IsTrue(lijl.Value)) - { - AppModuleInfo item = list.FirstOrDefault(m => m.ID == "JOBSITELIMIT"); - list.Remove(item); - } - } - if (!session.User.IsForesightUser) - { - bool isallowed = UserManagement.CheckUserPermission(session.SessionID, session.User.UID, 30); - if (!isallowed) - { - AppModuleInfo item = list.FirstOrDefault(m => m.ID == "OTRConfig"); - list.Remove(item); - } - } + //LicenseInfo license = SystemParams.GetLicense(); + //if (license != null && license.Items.Count > 0) + //{ + // LicenseItem lijl = license.Items.FirstOrDefault(m => m.Key == "JOBSITELIMIT"); + // if (lijl == null || !Helper.IsTrue(lijl.Value)) + // { + // AppModuleInfo item = list.FirstOrDefault(m => m.ID == "JOBSITELIMIT"); + // list.Remove(item); + // } + //} + //if (!session.User.IsForesightUser) + //{ + // bool isallowed = UserManagement.CheckUserPermission(session.SessionID, session.User.UID, 30); + // if (!isallowed) + // { + // AppModuleInfo item = list.FirstOrDefault(m => m.ID == "OTRConfig"); + // list.Remove(item); + // } + //} items = list.ToArray(); } else diff --git a/IronIntelContractorSiteLib/Maintenance/FuelRecordBasePage.cs b/IronIntelContractorSiteLib/Maintenance/FuelRecordBasePage.cs index ab7de78..768fc2b 100644 --- a/IronIntelContractorSiteLib/Maintenance/FuelRecordBasePage.cs +++ b/IronIntelContractorSiteLib/Maintenance/FuelRecordBasePage.cs @@ -11,6 +11,10 @@ using System.Web; using IronIntel.Contractor.Users; using Foresight.ServiceModel; using Foresight.Fleet.Services.AssetHealth; +using Foresight.Fleet.Services.Device; +using Foresight.Fleet.Services; +using Foresight.Fleet.Services.Attachment; +using IronIntel.Contractor.Attachment; namespace IronIntel.Contractor.Site.Maintenance { @@ -41,6 +45,21 @@ namespace IronIntel.Contractor.Site.Maintenance case "GETFUELTYPES": result = GetFuelTypes(); break; + case "GETFUELRECORDCOMMENTS": + result = GetFuelRecordComments(); + break; + case "ADDFUELRECORDCOMMENT": + result = AddFuelRecordComment(); + break; + case "GETATTACHMENTS": + result = GetAttachments(); + break; + case "ADDATTACHMENT": + result = AddAttachment(); + break; + case "DELETEATTACHMENT": + result = DeleteAttachment(); + break; } } } @@ -224,5 +243,149 @@ namespace IronIntel.Contractor.Site.Maintenance } } + private object GetFuelRecordComments() + { + try + { + if (GetCurrentLoginSession() != null) + { + string fuleid = Request.Form["ClientData"]; + + CommentInfo[] comments = CreateClient().GetComments(SystemParams.CompanyID, "FuelRecord", fuleid); + List list = new List(); + foreach (var c in comments) + { + CommentItem citem = new CommentItem(); + Helper.CloneProperty(citem, c); + + list.Add(citem); + } + + return list.ToArray(); + } + else + { + return new CommentItem[0]; + } + } + catch (Exception ex) + { + return ex.Message; + } + } + private object AddFuelRecordComment() + { + try + { + var user = GetCurrentUser(); + if (user != null) + { + string clientdata = HttpUtility.HtmlDecode(Request.Params["ClientData"]); + string[] ps = JsonConvert.DeserializeObject(clientdata); + string fuleid = ps[0]; + string comment = ps[1]; + + CreateClient().SubmitComment(SystemParams.CompanyID, user.IID, "FuelRecord", fuleid.ToString(), comment, false); + } + return ""; + } + catch (Exception ex) + { + return ex.Message; + } + } + + #region Attachment + + private object GetAttachments() + { + try + { + if (GetCurrentLoginSession() != null) + { + string fuleid = HttpUtility.HtmlDecode(Request.Form["ClientData"]); + + AttachmentInfo[] atts = CreateClient().GetAttachments(SystemParams.CompanyID, "FuelRecord", fuleid); + if (atts == null || atts.Length <= 0) + return new AttachmentItem[0]; + + List list = new List(); + foreach (AttachmentInfo att in atts) + { + AttachmentItem item = new AttachmentItem(); + Helper.CloneProperty(item, att); + item.AddedOn = item.AddedOn.AddHours(SystemParams.GetHoursOffset()); + list.Add(item); + } + return list.OrderBy(m => m.AddedOn).ToArray(); + } + else + return new AttachmentItem[0]; + } + catch (Exception ex) + { + return ex.Message; + } + } + + private object AddAttachment() + { + try + { + var session = GetCurrentLoginSession(); + if (session != null) + { + string fuleid = HttpUtility.HtmlDecode(Request.Form["ClientData"]); + + HttpPostedFile uploadFile = null; + byte[] iconfilebyte = null; + if (Request.Files.Count > 0) + { + uploadFile = Request.Files[0]; + iconfilebyte = ConvertFile2bytes(uploadFile); + } + + AttachmentInfo attachment = new AttachmentInfo(); + attachment.StringID = Guid.NewGuid().ToString().ToUpper(); + attachment.FileName = uploadFile == null ? "" : uploadFile.FileName; + attachment.Source = "FuelRecord"; + attachment.SourceID = fuleid; + attachment.FileData = iconfilebyte; + attachment.AddedByUserIID = session.User.UID; + + string attid = CreateClient().AddAttachmentLegacy(SystemParams.CompanyID, attachment); + + return "OK"; + } + return "Failed"; + } + catch (Exception ex) + { + return ex.Message; + } + } + + private object DeleteAttachment() + { + try + { + var session = GetCurrentLoginSession(); + if (session != null) + { + string attachid = HttpUtility.HtmlDecode(Request.Form["ClientData"]); + + CreateClient().DeleteAttachmentLegacy(SystemParams.CompanyID, attachid, session.User.UID); + return "OK"; + } + return "Failed"; + } + catch (Exception ex) + { + return ex.Message; + } + } + + #endregion + } } diff --git a/IronIntelContractorSiteLib/Maintenance/MaintenanceBasePage.cs b/IronIntelContractorSiteLib/Maintenance/MaintenanceBasePage.cs index f783d64..96a1af2 100644 --- a/IronIntelContractorSiteLib/Maintenance/MaintenanceBasePage.cs +++ b/IronIntelContractorSiteLib/Maintenance/MaintenanceBasePage.cs @@ -1,4 +1,5 @@ -using Foresight.ServiceModel; +using Foresight.Fleet.Services.User; +using Foresight.ServiceModel; using IronIntel.Services; using Newtonsoft.Json; using System; @@ -55,6 +56,50 @@ namespace IronIntel.Contractor.Site.Maintenance } } + var user = GetCurrentUser(); + if (user.UserType == Users.UserTypes.Common) + { + var client = FleetServiceClientHelper.CreateClient(); + Tuple[] pmss = client.GetUserPermissions(SystemParams.CompanyID, user.IID); + if (pmss.Length > 0) + { + Tuple alertpm = pmss.FirstOrDefault(m => m.Item1.Id == Feature.ALERTS_MANAGEMENT); + if (alertpm == null) + { + MaintenanceNavigateItem item = list.FirstOrDefault(m => m.ID == "nav_alertsmanagement"); + list.Remove(item); + } + Tuple wopm = pmss.FirstOrDefault(m => m.Item1.Id == Feature.WORK_ORDER); + if (wopm == null) + { + MaintenanceNavigateItem item = list.FirstOrDefault(m => m.ID == "nav_workorder"); + list.Remove(item); + } + Tuple pmpm = pmss.FirstOrDefault(m => m.Item1.Id == Feature.PREVENTATIVE_MAINTENANCE); + if (pmpm == null) + { + MaintenanceNavigateItem item1 = list.FirstOrDefault(m => m.ID == "nav_preventative"); + list.Remove(item1); + MaintenanceNavigateItem item2 = list.FirstOrDefault(m => m.ID == "nav_timebased"); + list.Remove(item2); + MaintenanceNavigateItem item3 = list.FirstOrDefault(m => m.ID == "nav_hours"); + list.Remove(item3); + MaintenanceNavigateItem item4 = list.FirstOrDefault(m => m.ID == "nav_absolutedistance"); + list.Remove(item4); + MaintenanceNavigateItem item5 = list.FirstOrDefault(m => m.ID == "nav_relativedistance"); + list.Remove(item5); + MaintenanceNavigateItem item6 = list.FirstOrDefault(m => m.ID == "nav_record"); + list.Remove(item6); + } + Tuple fuelpm = pmss.FirstOrDefault(m => m.Item1.Id == Feature.FUEL_RECORDS); + if (fuelpm == null) + { + MaintenanceNavigateItem item = list.FirstOrDefault(m => m.ID == "nav_fuelrecord"); + list.Remove(item); + } + } + + } return list.ToArray(); } diff --git a/IronIntelContractorSiteLib/Properties/AssemblyInfo.cs b/IronIntelContractorSiteLib/Properties/AssemblyInfo.cs index 724c0bf..10ca758 100644 --- a/IronIntelContractorSiteLib/Properties/AssemblyInfo.cs +++ b/IronIntelContractorSiteLib/Properties/AssemblyInfo.cs @@ -33,4 +33,4 @@ using System.Runtime.InteropServices; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("2.20.430")] +[assembly: AssemblyFileVersion("2.20.525")] diff --git a/IronIntelContractorSiteLib/Security/UserGroupBasePage.cs b/IronIntelContractorSiteLib/Security/UserGroupBasePage.cs index a17b4e9..b682b8c 100644 --- a/IronIntelContractorSiteLib/Security/UserGroupBasePage.cs +++ b/IronIntelContractorSiteLib/Security/UserGroupBasePage.cs @@ -103,9 +103,11 @@ namespace IronIntel.Contractor.Site.Security public string SaveGroup() { + var session = GetCurrentLoginSession(); var content = Request.Form["ClientData"]; content = HttpUtility.HtmlDecode(content); - var item = JsonConvert.DeserializeObject(content); + var group = JsonConvert.DeserializeObject(content); + var item = group.GroupInfo; // 保存组基本信息，与包含的全部用户 if (string.IsNullOrWhiteSpace(item.Name)) @@ -122,6 +124,11 @@ namespace IronIntel.Contractor.Site.Security else { UserManagement.UpdateGroup(item); + if (group.Features != null && group.Features.Length > 0) + { + var client = CreateClient(); + client.UpdateFeaturesForUser(SystemParams.CompanyID, item.ID, group.Features, session.User.UID); + } } return ""; } @@ -152,4 +159,9 @@ namespace IronIntel.Contractor.Site.Security public UserGroupInfo GroupInfo { get; set; } public UserInfo[] Users { get; set; } } + public class GroupObject + { + public UserGroupInfo GroupInfo { get; set; } + public KeyValuePair[] Features { get; set; } + } } diff --git a/IronIntelContractorSiteLib/UserManageBasePage.cs b/IronIntelContractorSiteLib/UserManageBasePage.cs index 93ea1dd..e607d40 100644 --- a/IronIntelContractorSiteLib/UserManageBasePage.cs +++ b/IronIntelContractorSiteLib/UserManageBasePage.cs @@ -93,9 +93,6 @@ namespace IronIntel.Contractor.Site case "GETMACHINELIST": result = GetMachineList(); break; - case "GETAVAILABLEFEATURES": - result = GetAvailableFeatures(); - break; case "GETFEATURESDEFINEDONUSER": result = GetFeaturesDefinedOnUser(); break; @@ -114,27 +111,42 @@ namespace IronIntel.Contractor.Site #region Security - private object GetAvailableFeatures() + private object GetFeaturesDefinedOnUser() { try { var session = GetCurrentLoginSession(); if (session != null) { + var useriid = Request.Form["ClientData"]; var client = CreateClient(); - Foresight.Fleet.Services.User.Feature[] features = client.GetAvailableFeatures(SystemParams.CompanyID); + Tuple[] features = client.GetFeaturesDefinedOnUser(SystemParams.CompanyID, useriid); + if (features == null || features.Length == 0) return new FeatureModuleItem[0]; List list = new List(); + List exceptModules = new List() + { + Foresight.Fleet.Services.User.FeatureModule.MODULE_MAPVIEW, + //Foresight.Fleet.Services.User.FeatureModule.MODULE_JOBSITES, + Foresight.Fleet.Services.User.FeatureModule.MODULE_CREDENTIAL, + Foresight.Fleet.Services.User.FeatureModule.MODULE_SECURITY, + Foresight.Fleet.Services.User.FeatureModule.MODULE_FICMANAGEMENT + }; + List exceptFeatures = new List() { Foresight.Fleet.Services.User.Feature.ASSET_GROUP }; foreach (var feature in features) { - FeatureModuleItem fmi = list.FirstOrDefault(m => m.Module.Id == feature.ModuleId); + if (exceptModules.Contains(feature.Item1.ModuleId)) + continue; + if (exceptFeatures.Contains(feature.Item1.Id)) + continue; + FeatureModuleItem fmi = list.FirstOrDefault(m => m.Module.Id == feature.Item1.ModuleId); if (fmi == null) { fmi = new FeatureModuleItem(); - fmi.Module = Foresight.Fleet.Services.User.FeatureModule.GetModule(feature.ModuleId); + fmi.Module = Foresight.Fleet.Services.User.FeatureModule.GetModule(feature.Item1.ModuleId); fmi.Features.Add(feature); list.Add(fmi); } @@ -153,28 +165,6 @@ namespace IronIntel.Contractor.Site } } - private object GetFeaturesDefinedOnUser() - { - try - { - var session = GetCurrentLoginSession(); - if (session != null) - { - var useriid = Request.Form["ClientData"]; - var client = CreateClient(); - KeyValuePair[] pms = client.GetFeaturesDefinedOnUser(SystemParams.CompanyID, useriid); - - return pms; - } - else - return new KeyValuePair[0]; - } - catch (Exception ex) - { - return ex.Message; - } - } - #endregion protected override bool AllowCurrentLoginSessionEnter() @@ -216,6 +206,7 @@ namespace IronIntel.Contractor.Site { var session = GetCurrentLoginSession(); if (session == null) return ""; + var ui = UserManagement.GetUserByIID(session.User.UID); var content = Request.Form["ClientData"]; content = HttpUtility.HtmlDecode(content); @@ -248,7 +239,8 @@ namespace IronIntel.Contractor.Site FI.FIC.Models.WorkspaceManager.SaveSubscribeMessageByEmail(user.Subscribe, item.IID); } - if (user.Features != null && user.Features.Length > 0) + if (user.Features != null && user.Features.Length > 0 + && (user.UserInfo.UserType < UserTypes.Admin || ui.UserType == UserTypes.SupperAdmin)) { var client = CreateClient(); client.UpdateFeaturesForUser(SystemParams.CompanyID, item.IID, user.Features, session.User.UID); @@ -593,7 +585,8 @@ namespace IronIntel.Contractor.Site public class FeatureModuleItem { public Foresight.Fleet.Services.User.FeatureModule Module { get; set; } - public List Features { get; set; } = new List(); + public List> Features { get; set; } = new List>(); + } } } diff --git a/Reflib/FIC/FICBLC.dll b/Reflib/FIC/FICBLC.dll index 9d3a5d8..8debfa0 100644 Binary files a/Reflib/FIC/FICBLC.dll and b/Reflib/FIC/FICBLC.dll differ diff --git a/Reflib/FIC/FICExport.dll b/Reflib/FIC/FICExport.dll index f7d6a1b..30f9807 100644 Binary files a/Reflib/FIC/FICExport.dll and b/Reflib/FIC/FICExport.dll differ diff --git a/Reflib/FIC/FICIntf.dll b/Reflib/FIC/FICIntf.dll index c1ee0db..a03cbb0 100644 Binary files a/Reflib/FIC/FICIntf.dll and b/Reflib/FIC/FICIntf.dll differ diff --git a/Reflib/FIC/FICIntfAdv.dll b/Reflib/FIC/FICIntfAdv.dll index 044168e..f39380a 100644 Binary files a/Reflib/FIC/FICIntfAdv.dll and b/Reflib/FIC/FICIntfAdv.dll differ diff --git a/Reflib/FIC/FICModels.dll b/Reflib/FIC/FICModels.dll index 746aabb..abf1003 100644 Binary files a/Reflib/FIC/FICModels.dll and b/Reflib/FIC/FICModels.dll differ diff --git a/Reflib/FIC/FRPTExtIntf.dll b/Reflib/FIC/FRPTExtIntf.dll index 10927eb..39cafe4 100644 Binary files a/Reflib/FIC/FRPTExtIntf.dll and b/Reflib/FIC/FRPTExtIntf.dll differ diff --git a/Reflib/FleetClientBase.dll b/Reflib/FleetClientBase.dll index 291fe11..8929361 100644 Binary files a/Reflib/FleetClientBase.dll and b/Reflib/FleetClientBase.dll differ diff --git a/Reflib/FleetServiceClient.dll b/Reflib/FleetServiceClient.dll index bdb8979..f7da860 100644 Binary files a/Reflib/FleetServiceClient.dll and b/Reflib/FleetServiceClient.dll differ diff --git a/Site b/Site index 85050ba..90bcf3a 160000 --- a/Site +++ b/Site @@ -1 +1 @@ -Subproject commit 85050baa397ab1c7cae7613f33db221b865dc2b3 +Subproject commit 90bcf3a8a337daecc61bf5a20f9f30f7ec81441e