安全隐患任务相关的

RMYY_CallCenter_Api.QuartzWorker/CreateAQYHTask.cs

@@ -0,0 +1,48 @@
+using Quartz;
+using RMYY_CallCenter_Api.Utility;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RMYY_CallCenter_Api.QuartzWorker
+{
+    public  class CreateAQYHTask : QuartzJob
+    {
+
+        string api = ConfigurationManager.AppSettings["AutoApi"];
+        public  CreateAQYHTask()
+        {
+            //每周一凌晨 1:00:00
+           CronExpression = "0 0 1 ? * MON";
+
+            // CronExpression = "0 20 10 ? * FRI";
+            DoWork += syncData;
+        }
+
+        public void syncData(object sender, EventArgs e)
+        {
+
+            WebClient web = new WebClient();
+            web.Encoding = Encoding.UTF8;
+     
+
+            try
+            {
+                string Dataur5 = web.DownloadString(api + "FaultRepair/CreateAqyhlTask");
+            }
+            catch (Exception m)
+            {
+                LogHelper.Error("FaultRepair/CreateAqyhlTask" + m.Message);
+            }
+ 
+
+
+
+
+        }
+    }
+}

RMYY_CallCenter_Api.QuartzWorker/RMYY_CallCenter_Api.QuartzWorker.csproj

@@ -52,6 +52,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CreateAQYHTask.cs" />
     <Compile Include="GetToken.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PushCalCount.cs" />
@@ -60,6 +61,7 @@
     <Compile Include="PushWorkorder.cs" />
     <Compile Include="QuartzJob.cs" />
     <Compile Include="QuartzWorker.cs" />
+    <Compile Include="SendMesAqyh.cs" />
     <Compile Include="SyncEquip.cs" />
     <Compile Include="SyncEquipToDevice.cs" />
   </ItemGroup>

RMYY_CallCenter_Api.QuartzWorker/SendMesAqyh.cs

@@ -0,0 +1,49 @@
+using Quartz;
+using RMYY_CallCenter_Api.Utility;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RMYY_CallCenter_Api.QuartzWorker
+{
+    public  class SendMesAqyh : QuartzJob
+    {
+
+        string api = ConfigurationManager.AppSettings["AutoApi"];
+        public SendMesAqyh()
+        {
+            //每周五上午8点
+
+             CronExpression = "0 0 8 ? * FRI";
+
+            // CronExpression = "0 25 10 ? * FRI";
+            DoWork += syncData;
+        }
+
+        public void syncData(object sender, EventArgs e)
+        {
+
+            WebClient web = new WebClient();
+            web.Encoding = Encoding.UTF8;
+     
+
+            try
+            {
+                string Dataur5 = web.DownloadString(api + "FaultRepair/SendAllMes");
+            }
+            catch (Exception m)
+            {
+                LogHelper.Error("FaultRepair/SendAllMes" + m.Message);
+            }
+ 
+
+
+
+
+        }
+    }
+}

RMYY_CallCenter_Api/Controllers/Adjust/DeviceController.cs

@@ -1680,25 +1680,27 @@ namespace RMYY_CallCenter_Api.Controllers.System
                         dicaddid = new Bll.T_Sys_DictionaryValue().Add(dr[0].ToString());
                     }
 
-                    Model.T_Adjust_DeviceType modeltype = typeservice.GetModel(dr[0].ToString(), dr[1].ToString(), 2);
+                    Model.T_Adjust_DeviceType modeltype = typeservice.GetModel(dr[0].ToString(), dr[1].ToString(), 1);
                     if (modeltype == null)
-                    {//添加设备类型记录
-                        Model.T_Adjust_DeviceType addmodel = new T_Adjust_DeviceType();
-                        addmodel.F_DeviceNum = 0;
-                        addmodel.F_IsDelete = 0;
+                    {
+                        continue;
+                        //添加设备类型记录
+                        //Model.T_Adjust_DeviceType addmodel = new T_Adjust_DeviceType();
+                        //addmodel.F_DeviceNum = 0;
+                        //addmodel.F_IsDelete = 0;
 
-                        addmodel.F_Classification = 2;
-                        addmodel.F_CreateBy = User.F_UserCode;
-                        addmodel.F_BigTypeName = dr[0].ToString();
-                        addmodel.F_TypeName = dr[1].ToString();
+                        //addmodel.F_Classification = 2;
+                        //addmodel.F_CreateBy = User.F_UserCode;
+                        //addmodel.F_BigTypeName = dr[0].ToString();
+                        //addmodel.F_TypeName = dr[1].ToString();
 
-                        addmodel.F_DicId = dicaddid;
-                        addmodel.F_CreateTime = DateTime.Now;
-                        addmodel.F_UpdateTime = DateTime.Now;
-                        int rees = typeservice.Add(addmodel);
+                        //addmodel.F_DicId = dicaddid;
+                        //addmodel.F_CreateTime = DateTime.Now;
+                        //addmodel.F_UpdateTime = DateTime.Now;
+                        //int rees = typeservice.Add(addmodel);
 
 
-                        deviceTypeId = rees;
+                        //deviceTypeId = rees;
                     }
 
                     var existslist = deviceservice.GetModelList(" F_AssetCode ='" + dr[4].ToString() + "'  ");

RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

@@ -620,7 +620,7 @@ namespace RMYY_CallCenter_Api.Controllers
                 return Error("重复添加失败");
             }
 
-            RedisHelper.StringSet(kkk, "1", new TimeSpan(0, 5, 0));
+         
 
 
             Model.T_FaultRepair_Base model = new Model.T_FaultRepair_Base();
@@ -635,8 +635,8 @@ namespace RMYY_CallCenter_Api.Controllers
             string abcate21 = input.WorkOrderCategory; 
 
             if (dtabcate22.Select("F_GDId='" + abcate21 + "'").Count() > 0) {
-                //安全隐患类的工单只能是安全隐患网格长 角色提交
-                if (User.F_RoleCode != "AQYHWGZ" && User.F_RoleCode != "GLY")
+                //安全隐患类的工单只能是安全隐患网格长 角色提交 && User.F_RoleCode != "GLY"
+                if (User.F_LabelID != 4 && User.F_RoleCode != "GLY")
                 {
                     return Error("你没有权限提交安全隐患类工单");
                 }
@@ -891,7 +891,7 @@ namespace RMYY_CallCenter_Api.Controllers
                    
                 
 
-                RedisHelper.StringDelete(kkk);
+                //RedisHelper.StringDelete(kkk);
                 if (returnid > 0)
                 {
                     LogHelper.Info("推送工单" + model.F_WorkOrderCode + ";returnid " + returnid);
@@ -1248,6 +1248,7 @@ namespace RMYY_CallCenter_Api.Controllers
 
 
                     trans.Complete();
+                    RedisHelper.StringSet(kkk, "1", new TimeSpan(0, 5, 0));
                     return Success("添加成功！", returnid);
             }
 
@@ -1260,7 +1261,7 @@ namespace RMYY_CallCenter_Api.Controllers
 
                
             }
-
+          
         }
 
         /// <summary>
@@ -13174,7 +13175,7 @@ datatable.Columns.Add("Equips", typeof(object));
         }
 
         [AllowAnonymous]
-        public ActionResult CreateAqyhlTask() {
+        public ActionResult CreateAqyhlTask(string day ) {
             DataTable dt = new DataTable();
             dt.Columns.Add("F_WeekName",typeof(string));
             dt.Columns.Add("F_WeekRange", typeof(string));
@@ -13185,20 +13186,27 @@ datatable.Columns.Add("Equips", typeof(object));
             dt.Columns.Add("F_Code", typeof(string));
             dt.Columns.Add("F_CreateTime", typeof(DateTime));
             dt.Columns.Add("F_EndTime", typeof(DateTime));
-            string usersql = "select F_UserCode, F_UserName from T_Sys_UserAccount where F_RoleId = (select F_RoleId from T_Sys_Role where F_RoleCode = 'gly')";
+            string usersql = " select F_UserCode, F_UserName from T_Sys_UserAccount where F_DeleteFlag=0 and  F_LabelId=4";
             DataTable dtuser= DbHelperSQL.Query(usersql).Tables[0];
            string week= Common.GetYearWeek(DateTime.Now);
-            DateTime ddd = DateTime.Now;  
+            DateTime ddd;
+            if (string.IsNullOrEmpty(day))
+            {
+                ddd= DateTime.Now;
+            }
+            else {
+                ddd = Convert.ToDateTime(day);
+            }
             foreach (DataRow item in dtuser.Rows)
             {
                 DataRow dr = dt.NewRow();
                 dr["F_WeekName"] = week;
-                dr["F_WeekRange"] = DateTime.Now.ToShortDateString()+ "~"+ DateTime.Now.AddDays(7).ToShortDateString();
+                dr["F_WeekRange"] = ddd.ToShortDateString()+ "~"+ ddd.AddDays(7).ToShortDateString();
                 dr["F_UserCode"] = item["F_UserCode"]  ;
                 dr["F_UserName"] = item["F_UserName"];
                 dr["F_ReportStatus"] = "待上报";
                 dr["F_CreateTime"] = ddd;
-                dr["F_EndTime"] = DateTime.Now.AddDays(7);
+                dr["F_EndTime"] = ddd.AddDays(7);
                 dt.Rows.Add(dr);
             }
 
@@ -13207,7 +13215,7 @@ datatable.Columns.Add("Equips", typeof(object));
 
             return Success("获取成功");
         }
-        [AllowAnonymous]
+ 
         public ActionResult AQYHTaskList(int isdc=0)
         {
            // 列表筛选：工单编号、工号、上报起止日期、渠道、工单类型（安全隐患类工单类型）、申请科室、工单状态、任务状态
@@ -13355,7 +13363,8 @@ datatable.Columns.Add("Equips", typeof(object));
                 , User.F_UserCode, EnumSmsType.repair
                            , 0);
             return Success("发送成功");
-        } 
+        }
+        [AllowAnonymous]
         public ActionResult SendAllMes()
         {
           List<Model.T_WeekTask>  weekTasks=   weekTaskbll.GetModelList("F_EndTime > GETDATE() and F_code is null");
@@ -13363,7 +13372,7 @@ datatable.Columns.Add("Equips", typeof(object));
             foreach (Model.T_WeekTask item in weekTasks )
             {
                 msg.AddInternalMessagesInfo("催办消息", "本周安全隐患类工单还未上报，请及时上报", item.F_UserCode
-           , User.F_UserCode, EnumSmsType.repair
+           , "8000", EnumSmsType.repair
                       , 0);
             }
        

RMYY_CallCenter_Api/Global.asax.cs

@@ -32,7 +32,10 @@ namespace RMYY_CallCenter_Api
                 _worker.AddWork(new PushEndAQYH());
                 _worker.AddWork(new PushCalCount());
                 _worker.AddWork(new SyncEquip());
-                _worker.AddWork(new SyncEquipToDevice());                
+                _worker.AddWork(new SyncEquipToDevice());
+                _worker.AddWork(new CreateAQYHTask());
+                _worker.AddWork(new SendMesAqyh());
+                
                 _worker.AddWork(new GetToken());
                 _worker.Start();