Explorar o código

暂停昆山自动发短信功能

shengxuefei %!s(int64=3) %!d(string=hai) anos
pai
achega
f6287acf2b

+ 31 - 14
PMS.NetCore/PMS.NetCore/Controllers/CustomerController.cs

@@ -103,26 +103,43 @@ namespace PMS.NetCore.Controllers
 
                 //去除重复的业主主键
                 var list1 = list.Where((x, i) => list.FindIndex(z => z.ownerid == x.ownerid) == i).ToList();
-                var list2 = new List<string>();
-                var owneridMsg = "";
-                foreach (var dto in list1)
+                //var list2 = new List<string>();
+                //var owneridMsg = "";
+                //foreach (var dto in list1)
+                //{
+                //    var index = list.IndexOf(dto);
+                //    var entity = manager.GetById(dto.ownerid);
+                //    if (entity != null)
+                //    {
+                //        owneridMsg += $"第{index + 1}条数据{dto.ownerid }业主编码已存在;";
+                //        list2.Add(dto.ownerid);
+                //    }
+                    
+                //}
+                //if(owneridMsg.IsNotNullAndEmpty())
+                //{
+                //    return Json(owneridMsg);
+                //}
+                for(int i=list1.Count-1;i>=0;i--)
                 {
-                    var index = list.IndexOf(dto);
-                    var entity = manager.GetById(dto.ownerid);
-                    if (entity != null)
+                    var entity = manager.GetById(list1[i].ownerid);
+                    if(entity!=null)
                     {
-                        owneridMsg += $"第{index + 1}条数据{dto.ownerid }业主编码已存在;";                        
+                        list1.Remove(list1[i]);
                     }
-                    list2.Add(dto.ownerid);
                 }
-                if(owneridMsg.IsNotNullAndEmpty())
+
+                int row = 0;
+                if(list1.Count>0)
                 {
-                    return Json(owneridMsg);
+                    //批量插入
+                    row = manager.Db.Insertable(list1).ExecuteCommand();
                 }
-
-
-                //批量插入
-                var row = manager.Db.Insertable(list1).ExecuteCommand();
+                else
+                {
+                    row = 1;
+                }
+                
                
                 
                 logger.Info($"【Fdc_pm_ownerAdd】row:{row}");

+ 14 - 14
PMS.NetCore/Service/QuartzTask.cs

@@ -37,21 +37,21 @@ namespace PMS.NetCore.Service
 
 
                 #region 执行发短信作业    注释掉,暂不执行
-                //创建触发器(也叫时间策略)
-                var trigger = TriggerBuilder.Create()
-                                  .StartNow()
-                                   //.WithSimpleSchedule(x => x.WithIntervalInMinutes(2).RepeatForever())//每10秒执行一次
+                ////创建触发器(也叫时间策略)
+                //var trigger = TriggerBuilder.Create()
+                //                  .StartNow()
+                //                   //.WithSimpleSchedule(x => x.WithIntervalInMinutes(2).RepeatForever())//每10秒执行一次
 
-                                   //.WithSimpleSchedule(x => x.WithIntervalInMinutes(5).RepeatForever()) //每5分钟执行一次
-                                   .WithSchedule(CronScheduleBuilder.DailyAtHourAndMinute(8, 0))   //每天8:00执行
-                                  .Build();
-                //创建作业实例
-                //Jobs即我们需要执行的作业
-                var jobDetailkunshan = JobBuilder.Create<KunshanPayCostSmsJob>()
-                                .WithIdentity("Myjobkunshan", "group")//我们给这个作业取了个“Myjob”的名字,并取了个组名为“group”
-                                .Build();
-                //将触发器和作业任务绑定到调度器中
-                await _scheduler.ScheduleJob(jobDetailkunshan, trigger);
+                //                   //.WithSimpleSchedule(x => x.WithIntervalInMinutes(5).RepeatForever()) //每5分钟执行一次
+                //                   .WithSchedule(CronScheduleBuilder.DailyAtHourAndMinute(8, 0))   //每天8:00执行
+                //                  .Build();
+                ////创建作业实例
+                ////Jobs即我们需要执行的作业
+                //var jobDetailkunshan = JobBuilder.Create<KunshanPayCostSmsJob>()
+                //                .WithIdentity("Myjobkunshan", "group")//我们给这个作业取了个“Myjob”的名字,并取了个组名为“group”
+                //                .Build();
+                ////将触发器和作业任务绑定到调度器中
+                //await _scheduler.ScheduleJob(jobDetailkunshan, trigger);
                 #endregion
             }
             #endregion