2023-09-13

SGGL/BLL/API/HJGL/APIPackagingManageService.cs

@@ -74,6 +74,14 @@ namespace BLL
 
                                             }).ToList();
                 bool isPower = Person_PersonsService.IsGeneralUnitByPersonId(personId, projectId);
+                if (!isPower)
+                {
+                    var roleList=  Person_PersonsService.GetRoleListByProjectIdPersonId(projectId, personId);
+                    if (roleList.Contains(Const.CQEngineer))
+                    {
+                        isPower=true;
+                    }
+                }
                 packagingManageItem.packagingManageDetailItem = q;
                 packagingManageItem.packagingPrepipeItems = packagingPrepipeItem;
                 packagingManageItem.isPower = isPower;

SGGL/BLL/Common/Funs.cs

@@ -1408,6 +1408,8 @@ namespace BLL
             client.Timeout = -1;
             var request = new RestRequest(Method.POST);
             request.AddHeader("token", Token);
+            request.AddHeader("ClientId", SysConstSetService.ClientId);
+            request.AddHeader("OperationCode", Baseurl.Substring(Baseurl.LastIndexOf("/", StringComparison.Ordinal)));
             if (!string.IsNullOrEmpty(JsonBody))
             {
                 request.AddJsonBody(JsonBody);

SGGL/BLL/SysManage/SysConstSetService.cs

@@ -6,8 +6,10 @@
     public static class SysConstSetService
     {
         private static string _CNCECPath;
+        private static string _CncecEsbPath;
         private static string _CNCECToken;
         private static string _CNCECTokenExTime;
+        private static string _ClientId;
 
         public static string CNCECPath
         {
@@ -29,6 +31,46 @@
                 _CNCECPath = value;
             }
         }
+        public static string CncecEsbPath
+        {
+            get
+            {
+                var sysSet5 = (from x in Funs.DB.Sys_Const where x.ConstText == "集团ESB地址" select x).ToList().FirstOrDefault();
+                if (sysSet5 != null)
+                {
+                    _CncecEsbPath = sysSet5.ConstValue;
+                }
+                else
+                {
+                    _CncecEsbPath = "";
+                }
+                return _CncecEsbPath;
+            }
+            set
+            {
+                _CncecEsbPath = value;
+            }
+        }
+        public static string ClientId
+        {
+            get
+            {
+                var sysSet5 = (from x in Funs.DB.Sys_Const where x.ConstText == "ClientId" select x).ToList().FirstOrDefault();
+                if (sysSet5 != null)
+                {
+                    _ClientId = sysSet5.ConstValue;
+                }
+                else
+                {
+                    _ClientId = "";
+                }
+                return _ClientId;
+            }
+            set
+            {
+                _ClientId = value;
+            }
+        }
         public static string CNCECToken
         {
             get

SGGL/BLL/TaskScheduling/TimerTask/TimerTaskBase.cs

@@ -23,7 +23,6 @@ using System.Threading.Tasks;
 
             //初始化计划者
             StdSchedulerFactory factory = new StdSchedulerFactory();
-           // StdSchedulerFactory factory = new StdSchedulerFactory(properties);
             IScheduler scheduler = await factory.GetScheduler();
             var jobAndTriggerMapping = new Dictionary<IJobDetail, IReadOnlyCollection<ITrigger>>(); 
             // 将映射关系包装成制度字典集合