优化更新

Docs/INIT_CLEAN.sql

@@ -0,0 +1,100 @@
+ 
+ /*
+ USE [We_AppDb_V2.3]; 
+ DECLARE @NO NVARCHAR(50);	SET @NO='JY2001000010079_';
+ 
+ UPDATE [dbo].[Train_Camps] SET [CampState]=2,[StartDate]=NULL WHERE [Id]=@NO
+ UPDATE [dbo].[Train_CampGroups] SET [CampGroupState]=1,[RunningInfo]=NULL,[StartDate]=NULL,[EngDate]=NULL,[RoundIndex]=1 WHERE [CampNo]=@NO
+ UPDATE [dbo].[Train_CampGroupScores] SET [SystemScore]=0,[CorrectionScore]=0,[SpecialistScore]=0,[AudienceScore]=0,[ReferenceScore]=0,[FinalTotalScore]=0,[BehaviorTagScoreInfo]='' WHERE [CampNo]=@NO
+ UPDATE  [dbo].[Train_CampGroupLogs] SET LogState=1  WHERE LogType=2 AND (LogState=2 OR LogState=3 OR LogState=4  OR LogState=5) AND [CampNo]=@NO 
+ DELETE  [dbo].[Train_CampGroupScores] WHERE [CampNo]=@NO 
+ DELETE  [dbo].[Train_CampGroupLogs] WHERE [CampNo]=@NO 
+ DELETE  [dbo].[Train_CampGroupPortraits] WHERE [CampNo]=@NO
+ DELETE  [dbo].[Train_CampGroupRoles] WHERE [GroupNo] like @NO+'%'
+ 
+ 
+
+
+ USE [We_AppDb_V2.3]; s
+ DECLARE @NO NVARCHAR(50);	SET @NO='JY2001000010075';
+
+ DELETE  [dbo].[Train_CampGroupScores] WHERE [CampNo]=@NO 
+ DELETE  [dbo].[Train_CampGroupLogs] WHERE [CampNo]=@NO 
+ DELETE  [dbo].[Train_CampGroupPortraits] WHERE [CampNo]=@NO
+ DELETE  [dbo].[Train_CampGroupRoles] WHERE [GroupNo] like @NO+'%'
+ --DELETE  [dbo].[Train_CampHelps] WHERE [CampNo]=@NO 
+  --DELETE  [dbo].[Train_CampGroups] WHERE [CampNo]=@NO 
+  --DELETE  [dbo].[Train_Camps] WHERE [Id]=@NO 
+
+ */
+
+  /*
+ 
+  -- 配置培训营 更改@NO为需配置的培训营编码
+  USE[We_AppDb_V2.3]; 
+  DECLARE @NO1 NVARCHAR(50);	SET @NO1='JY2001000010090_';
+ 
+  DECLARE scMap CURSOR FOR SELECT SceneNo,SceneName,AttachNos FROM Train_CampSceneMaps WHERE CampNo= 'JY2001000010075'
+  BEGIN TRY
+	DECLARE @SceneNo NVARCHAR(MAX), @SceneName NVARCHAR(MAX), @AttachNos NVARCHAR(MAX)
+	OPEN scMap
+	FETCH  scMap INTO @SceneNo, @SceneName,@AttachNos
+    WHILE @@fetch_status=0    
+    BEGIN 
+		PRINT   @SceneNo
+		INSERT INTO [dbo].[Train_CampSceneMaps] ([SceneNo],[SceneName],[AttachNos],[CampNo] ,[CreationTime] ,[CreatorUserId],[PhoneQuestionNo])
+			VALUES  ( @SceneNo, @SceneName, @AttachNos, @NO1, GETDATE(),3  ,NULL)
+	   FETCH  scMap INTO @SceneNo, @SceneName,@AttachNos
+	END
+	CLOSE scMap
+	DEALLOCATE  scMap
+  END TRY
+  BEGIN CATCH 
+	CLOSE scMap
+	DEALLOCATE  scMap
+	PRINT 'ERROR'
+  END CATCH
+  
+  BEGIN TRY
+     UPDATE [dbo].[Train_Camps]  SET [CampState]=2,[StartDate]=NULL,[AssessAuto]=B.AssessAuto,RoundScore=B.RoundScore,TrainingMinute=B.TrainingMinute ,
+	 AssessRoleNames=B.AssessRoleNames,[Address]=B.[Address],MaxRoundMinute=B.MaxRoundMinute,[Description]=B.[Description],[EvalBehaviorTags]=B.[EvalBehaviorTags],[Remark]=B.[Remark]
+	 FROM  (SELECT [AssessAuto],[AssessRoleNames],[Address],[MaxRoundMinute],[RoundScore],[TrainingMinute],[Description],[EvalBehaviorTags],[Remark] FROM  [dbo].[Train_Camps] where [Id]= 'JY2001000010075') as B  WHERE [Id]=@NO1
+  END TRY
+  BEGIN CATCH 
+  END CATCH
+
+  BEGIN TRY
+    INSERT INTO [dbo].[Train_CampGroups]
+           ([Id] ,[Name],[CampNo],[CampGroupState] ,[StartDate],[EngDate] ,[TrainingMinute],[IsDeleted],[DeleterUserId],[DeletionTime],[LastModificationTime],[LastModifierUserId],
+		   [CreationTime],[CreatorUserId] ,[RunningInfo] ,[RoundIndex])
+     VALUES
+           (@NO1+'_001','第1组',@NO1,1,NULL,NULL,0 ,0 ,NULL ,NULL ,NULL,NULL ,GETDATE(),3 ,NULL ,0)
+	INSERT INTO [dbo].[Train_CampGroups]
+           ([Id] ,[Name],[CampNo],[CampGroupState] ,[StartDate],[EngDate] ,[TrainingMinute],[IsDeleted],[DeleterUserId],[DeletionTime],[LastModificationTime],[LastModifierUserId],
+		   [CreationTime],[CreatorUserId] ,[RunningInfo] ,[RoundIndex])
+     VALUES
+           (@NO1+'_002','第2组',@NO1,1,NULL,NULL,0 ,0 ,NULL ,NULL ,NULL,NULL ,GETDATE(),3 ,NULL ,0)
+	INSERT INTO [dbo].[Train_CampGroups]
+           ([Id] ,[Name],[CampNo],[CampGroupState] ,[StartDate],[EngDate] ,[TrainingMinute],[IsDeleted],[DeleterUserId],[DeletionTime],[LastModificationTime],[LastModifierUserId],
+		   [CreationTime],[CreatorUserId] ,[RunningInfo] ,[RoundIndex])
+     VALUES
+           (@NO1+'_003','第3组',@NO1,1,NULL,NULL,0 ,0 ,NULL ,NULL ,NULL,NULL ,GETDATE(),3 ,NULL ,0)
+  END TRY
+  BEGIN CATCH 
+  END CATCH
+  BEGIN TRY
+	INSERT INTO [dbo].[Train_CampRoleGroups] ([RoleGroupNo],[CampNo],[CreationTime],[CreatorUserId]) VALUES ('JY2012000000251' ,@NO1 ,GETDATE()  ,3)
+    INSERT INTO [dbo].[Train_CampRoleGroups] ([RoleGroupNo],[CampNo],[CreationTime],[CreatorUserId]) VALUES ('JY2012000000252' ,@NO1 ,GETDATE()  ,3)
+    INSERT INTO [dbo].[Train_CampRoleGroups] ([RoleGroupNo],[CampNo],[CreationTime],[CreatorUserId]) VALUES ('JY2012000000253' ,@NO1 ,GETDATE()  ,3)
+    INSERT INTO [dbo].[Train_CampRoleGroups] ([RoleGroupNo],[CampNo],[CreationTime],[CreatorUserId]) VALUES ('JY2012000000254' ,@NO1 ,GETDATE()  ,3)
+    INSERT INTO [dbo].[Train_CampRoleGroups] ([RoleGroupNo],[CampNo],[CreationTime],[CreatorUserId]) VALUES ('JY2012000000255' ,@NO1 ,GETDATE()  ,3)
+  END TRY
+  BEGIN CATCH 
+  END CATCH
+ 
+  
+   */
+  
+
+  
+ 

SourceCode/WeApp.Application/BaseSystem/Query/Dto/SysLogDto.cs → SourceCode/WeApp.Application/BaseSystem/Query/Dto/QueryLogDto.cs

@@ -2,7 +2,7 @@
 
 namespace WeApp.BaseSystem.Query.Dto
 {
-    public class SysLogDto
+    public class QueryLogDto
     {
         public string Msg { get; set; }
         public string Name { get; set; }

SourceCode/WeApp.Application/BaseSystem/Query/IQueryAppService.cs

@@ -198,7 +198,7 @@ namespace WeApp.BaseSystem.Query
         /// <returns></returns>
         Task<List<QueryGroupScoreDto>> GetScoreChart(string no);
 
-        Task<List<SysLogDto>> GetCampLogs(string no);
+        Task<List<QueryLogDto>> GetCampLogs(string no);
 
         Task<StepList.StepInfo> GetCampStep(string no);
 

SourceCode/WeApp.Application/BaseSystem/Query/QueryAppService.cs

@@ -131,7 +131,7 @@ namespace WeApp.BaseSystem.Query
                 a.Id,
                 a.HelpName
             }).ToListAsync();
-            var str = "<option  value=\"\" selected >请选择学员提示信息...</option>";
+            var str = "";
             foreach (var l in list)
             {
                 str += $"<option  value=\"{l.Id}\">{l.HelpName}</option>";
@@ -590,10 +590,10 @@ namespace WeApp.BaseSystem.Query
             return dtoList;
         }
 
-        public async Task<List<SysLogDto>> GetCampLogs(string no)
+        public async Task<List<QueryLogDto>> GetCampLogs(string no)
         {
             var dtoList = await GlRepository.GetAllIncluding(a => a.CampGroupInfo).Where(a => a.CampNo == no && a.LogType == LogTypeDefinition.System)
-                .OrderBy(a => a.Id).Select(a => new SysLogDto()
+                .OrderBy(a => a.Id).Select(a => new QueryLogDto()
                 {
                     Name = a.CampGroupInfo != null ? a.CampGroupInfo.Name : "系统",
                     Msg = a.LogCommand,
@@ -970,7 +970,7 @@ namespace WeApp.BaseSystem.Query
                 GroupNo = a.Key,
                 GroupName = a.FirstOrDefault()?.GroupName,
                 Matched = a.Count(s => s.LogState == LogStateDefinition.HasMatch || s.LogState == LogStateDefinition.HasSendMatch),
-                NotMatched = a.Count(s => s.LogState != LogStateDefinition.HasMatch && s.LogState != LogStateDefinition.HasSendMatch)
+                NotMatched = a.Count(s => s.LogState == LogStateDefinition.Send || s.LogState == LogStateDefinition.Submit)
             }).ToList();
             var groups = await GroupRepository.GetAllListAsync((a => a.CampNo == no));
             foreach (var group in groups)

SourceCode/WeApp.Application/WeApp.Application.csproj

@@ -297,7 +297,7 @@
     <Compile Include="BaseSystem\Notifications\INotificationAppService.cs" />
     <Compile Include="BaseSystem\Notifications\NotificationService.cs" />
     <Compile Include="BaseSystem\Query\Dto\ChartDto.cs" />
-    <Compile Include="BaseSystem\Query\Dto\SysLogDto.cs" />
+    <Compile Include="BaseSystem\Query\Dto\QueryLogDto.cs" />
     <Compile Include="BaseSystem\Query\IQueryAppService.cs" />
     <Compile Include="BaseSystem\Query\QueryAppService.cs" />
     <Compile Include="BaseSystem\Roles\Dto\PermissionDto.cs" />

SourceCode/WeApp.Core/CommonManager/MqttClient/WeAppMsgClientManager.cs

@@ -404,6 +404,12 @@ namespace WeApp.CommonManager.MqttClient
                     group.RunningInfo = runningInfo.Obj2String();
                     group.RoundIndex = runningInfo.CurrentRoundIndex;
                     GroupRepository.Update(group);
+                    var gs = CacheManager.GetGroupRoundScore(groupNo, group.RoundIndex, GsRepository).Result;
+                    if (gs != null)
+                    {
+                        gs.SystemScore = runningInfo.RoundScore;
+                        GsRepository.Update(gs);
+                    }
                     UnitOfWorkManager.Current.SaveChanges();
                     IwbHubContext.Clients.Group(group.CampNo).getRunningChange(new { no = groupNo }.Obj2String());
                 }

SourceCode/WeApp.Web/Views/MsgMonitor/Index.cshtml

@@ -82,6 +82,10 @@
     <script>
         $(function () {
             Scroll($('.msg-box'));
+            setInterval(function () {
+                Send();
+                EngineSend();
+            },1000*5)
         });
 
         function Scroll(that) {
@@ -155,4 +159,4 @@
             }
         };
     </script>
-}
+}

SourceCode/WeApp.Web/Views/Play/Wait.cshtml

@@ -81,6 +81,22 @@
                         //课程描述图片(知识信息)
                         window.LoadDescImage(res.DescImage);
                     }
+                },
+                error: function () {
+                    $.iwbGet({
+                        url: "/Content/V2/Config/Screen/default.json",
+                        success: function (res) {
+                            console.log("===========>", res);
+                            if (res) {
+                                //暖场视频
+                                window.PlayLoop(res.WaitVideo);
+                                //操作文档图片
+                                window.LoadHelpImages(res.HelpImages);
+                                //课程描述图片(知识信息)
+                                window.LoadDescImage(res.DescImage);
+                            }
+                        }
+                    });
                 }
             });
         });

SourceCode/WeApp.Web/Views/Play/__/_Title.cshtml

@@ -46,7 +46,7 @@
             clearInterval(currentTimer);
             rate = rate || 1;
             var today = new Date();
-            time = (time || new Date()) - new Date(today.getFullYear(), today.getMonth(), today.getDay());
+            time = (time || new Date()) - new Date(today.getFullYear(), today.getMonth(), today.getDate());
             currentTimer = setInterval(function () {
                 time += 1000 * rate;
                 var hour = parseInt(time / 1000 / 60 / 60 % 24),

SourceCode/WeApp.Web/Views/Train/Eval.cshtml

@@ -272,6 +272,8 @@
                                             <select class="form-control required" id="cmd-p" name="cmd-p" placeholder="请选择操作指令..." style="width: 100%">
                                                 <option value="" selected="">请选择页面指令...</option>
                                                 <option value="1">刷新所有页面</option>
+                                                <option value="2,3,4">刷新学员公共屏页面</option>
+                                                <option value="2,3">刷新学员及指挥长页面</option>
                                                 <option value="2">刷新学员页面</option>
                                                 <option value="3">刷新指挥长页面</option>
                                                 <option value="4">刷新公共屏页面</option>
@@ -712,7 +714,6 @@
                                     });
                                     abp.message.warn(`已自动发送倒计时命令：${m}分钟，速率1秒`);
 
-
                         }
                             </text>
                         }
@@ -722,19 +723,26 @@
                                 abp.log.debug('sendShowTotalRoundScore===>HIDE:', no, cmd);
                             });
                         }
+                        if (type == 0 && (cmd == "@(CampGroupStateDefinition.HeadQuarterBuilding)")) {
+                            //自动停止刷新页面
+
+                        }
 
                     }
                 });
             }
         }
 
-        function PageCmd(no) {
-            var cmd = $('#modal-cmd #cmd-p').val();
-            if (cmd) {
-                iwbHub.server.sendReload(no, cmd).done(function() {
-                    abp.log.debug('PageReload:', no, cmd);
-                });
-                abp.message.warn('指令已发送！');
+        function PageCmd(no,cmds) {
+            cmds = cmds || $('#modal-cmd #cmd-p').val();
+            if (cmds) {
+                var arr = cmds.split(",")
+                arr.forEach(function (cmd) {
+                    iwbHub.server.sendReload(no, cmd).done(function () {
+                        console.debug('PageReload:', no, cmd);
+                    });
+                })
+                abp.message.info('指令已发送！');
             }
         }
 
@@ -1124,17 +1132,17 @@
         }
     </script>
 
-    }
+}
 
-    <section style="display: none">
-        <select id="hid-type">
-            <option value=""></option>
-        </select>
-        <select id="hid-camp-state">
-            @(Html.Raw(campState))
-        </select>
-        <select id="hid-group-state">
-            @(Html.Raw(groupState))
-        </select>
-        @*@Html.DropDownList("hid-type", type)*@
-    </section>
+<section style="display: none">
+    <select id="hid-type">
+        <option value=""></option>
+    </select>
+    <select id="hid-camp-state">
+        @(Html.Raw(campState))
+    </select>
+    <select id="hid-group-state">
+        @(Html.Raw(groupState))
+    </select>
+    @*@Html.DropDownList("hid-type", type)*@
+</section>

SourceCode/WeApp.Web/WeApp.Web.csproj

@@ -1801,7 +1801,7 @@
     <Content Include="Content\Data\EnvInfo.json" />
     <Content Include="Content\Scss\play-v2.scss" />
     <Content Include="Content\Scss\zhadan.scss" />
-    <Content Include="Content\V2\Config\Screen\JY2001000001010.json" />
+    <Content Include="Content\V2\Config\Screen\default.json" />
     <None Include="packages.config" />
     <None Include="Properties\PublishProfiles\App.pubxml" />
     <None Include="Resources\Guids.iwbx" />