20223-10-24 20个场景初步完成

ljq
1 parent 68bc04ff
Showing 7 changed files with 143 additions and 20 deletions
src/main/java/com/bsth/repository/subject/SubjectUserRepository.java
src/main/java/com/bsth/service/subject/impl/SubjectUserServiceImpl.java
src/main/java/com/bsth/util/subject/subEnum.java
src/main/java/com/bsth/util/subject/subEnumDevice.java
src/main/resources/static/pages/ddexam/list.html
src/main/resources/static/real_control_v2/js/subject/subject.js
src/main/resources/static/real_control_v2/main.html
@@ -18,7 +18,7 @@ public interface SubjectUserRepository extends BaseRepository&lt;SubjectUser, Integ
     @Transactional
     @Modifying
     @Query(value = "update SubjectUser su set  su.result =?1,su.updateBy = ?2,su.updateDate = ?3  where  su.id =?4")
-    int updates(String rq, Integer id, Date updateDate, Integer userId);
+    int updates(String result, Integer id, Date updateDate, Integer userId);
  
     @Query(value="select su.user_id,su.rq,su.result,u.name,u.user_name "
             + " from bsth_subject_user su,bsth_c_sys_user u where su.user_id =u.id and su.rq =?1 and su.user_id in ( ?2 ) "
 package com.bsth.service.subject.impl;
  
+import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.Line;
+import com.bsth.entity.directive.D60;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.subject.Subject;
 import com.bsth.entity.subject.SubjectUser;
@@ -14,6 +16,7 @@ import com.bsth.service.ddexam.impl.DdexamServiceImpl;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.subject.SubjectUserService;
 import com.bsth.util.subject.subEnum;
+import com.bsth.util.subject.subEnumDevice;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +46,9 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer
     @Autowired
     DdexamServiceImpl ddexamService;
  
+    @Autowired
+    DayOfDirectives dayOfDirectives;
+
  
     public List<SubjectUser> userAll(){
         SysUser user = SecurityUtils.getCurrentUser();
@@ -74,14 +80,25 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer
  
         //类型
         String type = sur.getSubjectId().getType();
-        //判断答题是否正确
-        subEnum sjm = subEnum.valueOf(type);
-        String result;
-        if (sur.getSubjectId().getSchStatus().equals("0")){
+
+       
+        String result = null;
+        if (sur.getSubjectId().getSchStatus().equals("0")){ //区分上下行的班次数据
+            //判断答题是否正确
+            subEnum sjm = subEnum.valueOf(type);
             List<ScheduleRealInfo> sh = sch.stream().filter(s -> s.getXlDir().equals(sur.getSubjectId().getDir())).collect(Collectors.toList());
              result = sjm.run(sur,sh) == true ? "0" : "1";
-        }else {
+        }if (sur.getSubjectId().getSchStatus().equals("1")) {//全量的班次数据
+            //判断答题是否正确
+            subEnum sjm = subEnum.valueOf(type);
              result = sjm.run(sur,sch) == true ? "0" : "1";
+        }if (sur.getSubjectId().getSchStatus().equals("2")) { //与设备对接的
+            subEnumDevice sjmdrivce = subEnumDevice.valueOf(type);
+       
+            //运营指令
+            Collection<D60> yyArray = dayOfDirectives.all60();//查看当日缓存指令
+            
+            result =  sjmdrivce.run(sur,yyArray,user) == true ? "0" : "1";
         }
  
         SimpleDateFormat formatter = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss");
@@ -172,7 +172,7 @@ public enum subEnum {
             return false;
         }
     },
-    //直放
+    //放站
     fz {
         @Override
         public boolean run(SubjectUser sur, List<ScheduleRealInfo> sch) {
@@ -191,7 +191,7 @@ public enum subEnum {
             return false;
         }
     },
-    //直放
+    //子任务
     zrw {
         @Override
         public boolean run(SubjectUser sur, List<ScheduleRealInfo> sch) {
@@ -235,7 +235,6 @@ public enum subEnum {
             SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
             //排序
             Collections.sort(sch, new ScheduleComparator.DFSJ2());
-            int su = 0;
             try{
                 //判断结果是否合格
                 String df = "";
@@ -320,6 +319,7 @@ public enum subEnum {
                     //判断当前班次是否符合条件  全部班次
                     if ( s.getBcType().equals(t[0]) && s.isSflj() == true && s.getClZbh().equals(t[2]) && 
                             (s.getDfsj().equals(sj) || s.getDfsj().equals(t[1]) )) {
+                        
                         if((s.getQdzName().equals(t[3]) && s.getZdzName().equals(t[4]) ) ||
                                 s.getQdzName().equals(t[4]) && s.getZdzName().equals(t[3])){
                             nts++;
@@ -441,18 +441,59 @@ public enum subEnum {
             int su = 0;
             try{
                 //判断结果是否合格
+                int sunm = 0;
                 for (int i = 0; i < sch.size(); i++) {
                     ScheduleRealInfo s = sch.get(i);
-                    //判断当前班次是否符合条件
-                    if ( s.getDfsj().equals(sj) && s.getjGh().equals(t[1])) {
-                        su ++;
+                    if ( s.getDfsj().equals(sj)) { //当前排班
+                        su = i;
+                    }
+                    //后续两个班次
+                    if (su != 0 && i > su && i <= su + 3){
+                        Long stn = sdf.parse(s.getDfsj()).getTime() - sdf.parse(s.getFcsj()).getTime();
+                        int stg = stn.intValue() / 60 / 1000;
+                        sunm = stg == Integer.parseInt(t[0]) ? sunm + 1 : sunm;  //
                     }
+                }
+                if(sunm == 3)
+                    return true;
  
-                    if ( s.getDfsj().equals(t[2]) && s.getjGh().equals(t[0])) {
-                        su ++;
+
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+
+            return false;
+        }
+    },
+    
+    //批量误点调整
+    pwd{
+        @Override
+        public boolean run(SubjectUser sur, List<ScheduleRealInfo> sch){
+            String sj = sur.getSubjectId().getFcsj();//计划发车时间
+            String answer = sur.getSubjectId().getAnswer();//答案
+            String[] t = answer.split(","); //0
+            SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
+            //排序
+            Collections.sort(sch, new ScheduleComparator.DFSJ2());
+            int su = 0;
+            try{
+                //判断结果是否合格
+                int sunm = 0;
+                for (int i = 0; i < sch.size(); i++) {
+                    ScheduleRealInfo s = sch.get(i);
+                    if ( s.getDfsj().equals(sj)) { //当前排班
+                        Float stn =  s.getLateMinute();
+                        sunm = stn == Integer.parseInt(t[0]) ? sunm + 1 : sunm;  //班次调整待发延后10分
+                        su = i;
+                    }
+                    //后续两个班次
+                    if (su != 0 && i > su && i <= su + 2){
+                        Float stn =  s.getLateMinute();
+                        sunm = stn == Integer.parseInt(t[0]) ? sunm + 1 : sunm;  //班次调整待发延后10分
                     }
                 }
-                if(su == 2)
+                if(sunm == 3)
                     return true;
  
  
+package com.bsth.util.subject;
+
+import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.entity.directive.D60;
+import com.bsth.entity.realcontrol.ChildTaskPlan;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.subject.SubjectUser;
+import com.bsth.entity.sys.SysUser;
+
+import java.text.SimpleDateFormat;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public enum subEnumDevice {
+
+   
+    //手动切换车辆方向
+    qdir{ 
+        @Override
+        public boolean run(SubjectUser sur, Collection<D60> yyArray,SysUser user){
+            for (D60 d60 : yyArray){
+                if (d60.getSender().equals(user.getUserName())){ //用户名
+                    if(d60.getData().getTxtContent().equals("切换为 下行营运")){
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+    },
+    //手动切换车辆方向
+    xf{
+        @Override
+        public boolean run(SubjectUser sur, Collection<D60> yyArray,SysUser user){
+            String answer = sur.getSubjectId().getAnswer();//答案
+            String[] t = answer.split(","); //0
+            for (D60 d60 : yyArray){
+                if (d60.getDeviceId().contains(user.getUserName()) && d60.getDeviceId().contains(t[0]) ){ //用户名
+                    return true;
+                }
+            }
+            return false;
+        }
+    },
+    //手动切换车辆方向
+    pxf{
+        @Override
+        public boolean run(SubjectUser sur, Collection<D60> yyArray,SysUser user){
+            int num = 0;
+            for (D60 d60 : yyArray){
+                if (d60.getDeviceId().contains(user.getUserName())){ //用户名
+                    num = num + 1;
+                }
+            }
+            if (num >= 5)
+                return true;
+            
+            return false;
+        }
+    };
+    
+    
+    public abstract boolean run(SubjectUser sur, Collection<D60> yyArray, SysUser user);
+}
@@ -32,6 +32,7 @@
                         <tr>
                             <td>序号</td>
                             <td>考生账号</td>
+                            <td>考生名称</td>
                             <td>考生们密码</td>
                             <td>考生状态</td>
                         </tr>
@@ -68,6 +69,7 @@
             {{i+1}}
         </td>
         <td>{{obj.userName}}</td>
+        <td>{{obj.name}}</td>
         <td>123456</td>
         <td>
         {{if obj.ksstatus=="1"}}已初始化{{else}}未初始化{{/if}}
@@ -3,11 +3,7 @@ var su_subject = (function () {
  
     var $wrap = $('.uk-panels');
     var init =function(cb) {
-        
         ks();
-
-
-            
     };
  
     function ks(){
@@ -79,7 +79,7 @@
             场景：{{subjectId.subjectText}}
         </div>
         <div class="north-tmx">
-            操作：{{subjectId.operateTest}}
+            操作：({{subjectId.dir == 0 ? '上行':'下行'}}){{subjectId.operateTest}}
         </div>
         <div class="north-button">
             <button id="submit" class="subject_button" data-id="{{id}}">提交</button>