1

ljq
1 parent 5b80c8d1
Showing 25 changed files with 89 additions and 141 deletions
README.md
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/repository/StationRouteStRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/repository/subject/SubjectUserRepository.java
src/main/java/com/bsth/service/ddexam/impl/DdexamServiceImpl.java
src/main/java/com/bsth/service/subject/impl/SubjectUserServiceImpl.java
src/main/java/com/bsth/util/subject/subEnum.java
src/main/resources/application-dev.properties
src/main/resources/application-test.properties
src/main/resources/application.properties
src/main/resources/control-jdbc.properties
src/main/resources/datatools/config-prod.properties
src/main/resources/ms-jdbc.properties
src/main/resources/static/index.html
src/main/resources/static/login.html
src/main/resources/static/pages/forms/mould/waybill.xls
src/main/resources/static/pages/forms/mould/waybill_minhang.xls
src/main/resources/static/pages/forms/mould/waybill_minhang_dl.xls
src/main/resources/static/pages/forms/statement/waybill.html
-上海交通职业技术学院智慧交通系 2023
-新型高职建设“公共交通运营调度教学
-资源”项目
 \ No newline at end of file
+
 \ No newline at end of file
@@ -147,18 +147,18 @@ public class XDApplication implements CommandLineRunner {
         //sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 20, TimeUnit.SECONDS);//检查班次误点
         //sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据
         //sexec.scheduleWithFixedDelay(rfidDataLoader, 5, 5, TimeUnit.SECONDS);//抓取RFID数据
-        sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 60, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码
+        //sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 60, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码
         //sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线
         sexec.scheduleWithFixedDelay(schedulePstThread, 180, 10, TimeUnit.SECONDS);//班次延迟入库线程
         sexec.scheduleWithFixedDelay(seiPstThread, 180, 60, TimeUnit.SECONDS);//班次修正日志入库
         sexec.scheduleWithFixedDelay(directivesPstThread, 120, 60, TimeUnit.SECONDS);//调度指令延迟入库
         sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
-        sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据
+        //sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据
         sexec.scheduleWithFixedDelay(basicDataLoader, 1, 1, TimeUnit.HOURS);//基础数据更新
-        sexec.scheduleWithFixedDelay(autoExecScanThread, 180, 50, TimeUnit.SECONDS);//班次自动执行
+        //sexec.scheduleWithFixedDelay(autoExecScanThread, 180, 50, TimeUnit.SECONDS);//班次自动执行
         //DirectivePushQueue.start();//消息队列 -指令，系统下发的
-        WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
+        //WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
         /** 线调为其他程序提供的数据 --写入数据库 */
         //sexec.scheduleWithFixedDelay(fcxxUpdateThread, 160, 30, TimeUnit.SECONDS);//发车信息（发车屏、信息发布）
@@ -36,7 +36,7 @@ import java.util.Map;
 public interface StationRouteStRepository extends BaseRepository<StationRouteSt, Integer> {
-    @Query("select r from StationRouteSt r where r.lineCode=?1 and r.destroy=0 order by r.stationRouteCode")
+    @Query("select r from StationRouteSt r where r.lineCode=?1  and  r.destroy=0 order by r.stationRouteCode")
     List<StationRouteSt> findByLine(String lineCode);
 }
@@ -239,8 +239,9 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select count(*) from ScheduleRealInfo s where s.scheduleDateStr = ?1 and s.xlBm  = ?2")
 	int selectCountAll(String scheduleDateStr,String lineCode);
-
+	
+	@Transactional
 	@Modifying
-	@Query(value = "delete from ScheduleRealInfo sr where sr.xlBm in ( ?1 )")
-	void deleteScheduleRealInfoBylineCodes(List<String> lineCodes);
+	@Query(value = "delete from ScheduleRealInfo sr where sr.xlBm in ( ?1 ) and sr.scheduleDateStr= ?2")
+	void deleteScheduleRealInfoBylineCodes(List<String> lineCodes,String rq);
 }
@@ -30,6 +30,7 @@ public interface SubjectUserRepository extends BaseRepository&lt;SubjectUser, Integ
             + " order by  su.user_id",nativeQuery=true)
     List<Object[]> searchSubjectUserDetail(String rq, String userId);
+    @Transactional
     @Modifying
     @Query(value = "delete from SubjectUser s where s.rq=?1 and s.userId.id in ( ?2 )")
     void deleteSubjectUserByUserIds(String date, List<Integer> userIds);
@@ -95,7 +95,7 @@ public class DdexamServiceImpl implements DdexamService {
     @Override
     public int hftime(){
-        URLConnection url = null;
+      /*  URLConnection url = null;
         try {
             java.net.URL baseUrl;
             baseUrl = com.bsth.webService.trafficManage.geotool.services.Internal.class.getResource(".");
@@ -105,10 +105,10 @@ public class DdexamServiceImpl implements DdexamService {
             url.connect(); //发出连接
             long ld = url.getDate(); //取得网站日期时间
             Date date = new Date(ld); //转换为标准时间对象
-          /*  Calendar calendar = Calendar.getInstance();
+          *//*  Calendar calendar = Calendar.getInstance();
             calendar.setTime(date);
             calendar.add(Calendar.YEAR, -1);//当前时间减去一年，即一年前的时间  
-            //（时间校准网上快了一年，减去一年）*/
+            //（时间校准网上快了一年，减去一年）*//*
             String data = sdfhms.format(date.getTime());
             String[] lk = data.split(" ");
             if(lk.length == 2){
@@ -117,7 +117,7 @@ public class DdexamServiceImpl implements DdexamService {
             }
         }  catch (IOException e) {
             e.printStackTrace();
-        }
+        }*/
         return 0;
     }
@@ -125,11 +125,11 @@ public class DdexamServiceImpl implements DdexamService {
     @Override
     public int initDate(String date) {
-        try {
+        /*try {
             Runtime.getRuntime().exec(ConfigUtil.get("jp.time") +" " +date);//Windows 系统
         }catch (Exception e){
             log.error("修改系统时间失败",e);
-        }
+        }*/
         return 1;
     }
@@ -262,69 +262,6 @@ public class DdexamServiceImpl implements DdexamService {
         return m;
     }
-    /*public void aa(){
-        Long start = System.currentTimeMillis();
-        Map m = new HashMap<>();
-        try {  //用户当天分配完直接改状态  无二次分配的可能
-            List<SysUser> userList = sysUserRepository.findBySusUser(); //已有的用户   不考虑用户角色表  正常情况下创建必分配
-            if (userList.size() >= rs) {  //满足考试人数  默认配置都是全的
-                new Thread() {
-                    public  synchronized  void run() {
-                        if(snt(rs,userList,0)){
-                            log.info("考试初始化创建成功");
-                            kk();
-                        }
-                    }
-                }.start();
-            } else {
-                if (userList.size() == 0) { //考试人数 全部重新创建
-                    new Thread() {
-                        public  synchronized  void run() {
-                            if(usercreateType(rs)){
-                                log.info("考试初始化创建成功");
-                                kk();
-                            }
-                        }
-                    }.start();
-
-                } else { //已有的人检查分配线路   不够的创建
-
-                    new Thread() {
-                        public  synchronized  void run() {
-                            if(snt(rs,userList,1)){
-                                kk();
-                            }
-                        }
-                    }.start();
-
-                    int st = rs - userList.size(); //未创建考试人数
-                    //*    //未分配的创建线路并分配
-                    if(usercreateType(st)){ //暂无问题
-                        log.info("考试初始化创建成功");
-                        kk();
-                    }//*
-                    new Thread() {
-                        public  synchronized  void run() {
-                            if(usercreateType(st)){
-                                log.info("考试初始化创建成功");
-                                kk();
-                            }
-                        }
-                    }.start();
-
-                }
-            }
-        }catch (Exception e){
-            log.error("-----考试初始化失败------",e);
-            m.put("code","创建失败");
-            return m;
-        }
-        //调用排班初始话功能
-        m.put("code","创建成功");
-        System.out.println("-------------本次执行时间-----------"+(System.currentTimeMillis() - start));
-        return m;
-    }
-    */
     public void kk(){
         basicDataLoader.loadAllData(); //加载所有数据
         dayOfSchedule.lineAll(); //查询所有线路
@@ -372,7 +309,7 @@ public class DdexamServiceImpl implements DdexamService {
         if(t  >  0)
             return;
         //用旧线路code查出模板排班表
-        List<ScheduleRealInfoSt>  sristList =  ScheduleRealInfoStRepository.queryUserInfo(line.getCoLineCode(),"2021-11-18");//模板固定日期
+        List<ScheduleRealInfoSt>  sristList =  ScheduleRealInfoStRepository.queryUserInfo(line.getCoLineCode(),"2024-06-02");//模板固定日期
         List<ScheduleRealInfo>  sriList = new ArrayList<>();
         for(ScheduleRealInfoSt st : sristList){
             ScheduleRealInfo sri = new ScheduleRealInfo();
@@ -470,16 +407,18 @@ public class DdexamServiceImpl implements DdexamService {
         userRoles.setRoles(73); //统一用73考生
         bsthCSysUserRolesRepository.save(userRoles); //权限存库
         List<LineConfigSt> lineConfigList = lineConfigStRepository.findAll(); //线调 线路相关配置信息
-        Integer linebumber = lineRepository.findAll().size(); //线路数量 线路code
-        String [] mtline = {"A线","B线","C线","D线","E线","F线"}; //对应模板6条线 换成线路name
+        Integer linebumber = lineRepository.findAll().size() + 1; //线路数量 线路code
+        //String [] mtline = {"A线","B线","C线","D线","E线","F线"}; //对应模板6条线 换成线路name
         List<LineInformationSt> litst = (List<LineInformationSt>) LineInformationStRepository.findAll(); //所有模板线路标准和线路
-        if(litst.size() != 6){
+ /*       if(litst.size() != 6){
+            System.out.println("为满足6条线");
             return false;
-        }
+        }*/
         //让线路从1开始  部分功能0会异常
         if(linebumber == 0){
             linebumber = 1;
         }
+        
         String lineCodeStr = "";
         for(int j = 0 ; j < litst.size() ; j++){  //6个  <6
@@ -490,7 +429,7 @@ public class DdexamServiceImpl implements DdexamService {
             Integer linecodeId = linebumber++ ;
             line.setId(linecodeId);
             line.setLineCode(linecodeId.toString());
-            line.setName(mtline[j]+"-"+user.getUserName());
+            line.setName(line.getName()+"_"+user.getUserName());
             line.setCoLineCode(linest.getLineCode());
             lineRepository.save(line);  //线路添加
             //----------------线路--------------------------//
@@ -532,12 +471,13 @@ public class DdexamServiceImpl implements DdexamService {
         return true;
     }
-    public synchronized void  clearScheduleRealInfo(SysUser user){
+    public void  clearScheduleRealInfo(SysUser user){
         RealControAuthority hoit = realControAuthorityRepository.findByUserId(user.getId());
         String[] st = hoit.getLineCodeStr().split(",");
         List<String> lines=Arrays.asList(st);
+        String rq = sdf.format(new Date());
         //bsth_c_s_sp_info_real
-        scheduleRealInfoRepository.deleteScheduleRealInfoBylineCodes(lines);
+        scheduleRealInfoRepository.deleteScheduleRealInfoBylineCodes(lines,rq);
     }
 }
@@ -67,9 +67,9 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer
         Optional<SubjectUser> subjectUser = subjectUserRepository.findById(id);
         SubjectUser sur = subjectUser.isPresent() ? subjectUser.get() : null;
-        //线路编号 A线+用户id组成的
+        //线路编号 1505路+用户id组成的
         SysUser user = SecurityUtils.getCurrentUser();
-        String xlName = "A线-"+user.getUserName();
+        String xlName = "1505路_"+user.getUserName();
         Line line = lineRepository.findLineName(xlName);
         //缓存查看排班
         List<ScheduleRealInfo> sch =  dayOfSchedule.findByLineCode(line.getLineCode());
@@ -90,22 +90,22 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer
             List<ScheduleRealInfo> sh = sch.stream().filter(s -> s.getXlDir().equals(sur.getSubjectId().getDir())).collect(Collectors.toList());
             m = sjm.run(sur,sh);
             result = new Boolean(m.get("state").toString()) == true ? "0" : "1";
-            
-            
         }if (sur.getSubjectId().getSchStatus().equals("1")) {//全量的班次数据
             //判断答题是否正确
             subEnum sjm = subEnum.valueOf(type);
             m = sjm.run(sur,sch);
             result = new Boolean(m.get("state").toString()) == true ? "0" : "1";
-
         }if (sur.getSubjectId().getSchStatus().equals("2")) { //与设备对接的
             subEnumDevice sjmdrivce = subEnumDevice.valueOf(type);
-       
             //运营指令
             Collection<D60> yyArray = dayOfDirectives.all60();//查看当日缓存指令
             m = sjmdrivce.run(sur,yyArray,user);
             result = new Boolean(m.get("state").toString()) == true ? "0" : "1";
         }
+        if ((sur.getSubjectId().getSchStatus().equals("4")) ){
+            return "特殊题目";
+        }
+        
         if (m.get("message") != null)
             remark = m.get("message").toString();
@@ -237,7 +237,6 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer
     }
     @Override
-    @Transactional
     public void selectSubject(String[] ids,String[] fractions,String isOperate,String className) throws Exception{
         SysUser loginUser = SecurityUtils.getCurrentUser();
         List<SysUser> userList;
@@ -272,10 +271,10 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer
                 subjectUserRepository.save(subjectUser);
             }
         }
-        //初始化考生排班 只初始化A线
+        //初始化考生排班 只初始化A线 --
         new Thread() {
             public synchronized void run() {
-                if (ddexamService.snt(userList,true)) {
+                if (ddexamService.snt(userList,false)) {
                     ddexamService.kk();
                 }
             }
@@ -104,7 +104,7 @@ public enum subEnum {
                             s.getRemarks().contains(t[2])) {
                         su = i;
                     }
-            
+                    //青浦班次选择7:52会导致一个班次在前面
                     //判断后续三个班次的dfsj修改成功 n烂班  n-1 与 n+1 n+1与n+2
                     if (su != 0 && i > su && i <= su + 3){
                         if (i == su +1){ //烂班下第一个
@@ -497,7 +497,7 @@ public enum subEnum {
             String[] t = answer.split(","); //0
             SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
             //排序
-            Collections.sort(sch, new ScheduleComparator.DFSJ2());
+            Collections.sort(sch, new ScheduleComparator.DFSJ());
             int su = 0;
             try{
                 //判断结果是否合格
@@ -507,7 +507,7 @@ public enum subEnum {
                     if ( s.getFcsj().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;
-server.port=9088
+server.port=9089
 # dubbo服务化使用开关flag
 dubbo.use=false
@@ -14,7 +14,7 @@ spring.jpa.show-sql= false
 #DATABASE
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://127.0.0.1/school_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://127.0.0.1/school_control_qp?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.url= jdbc:mysql://192.168.168.222/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
 spring.datasource.password= root
 server.port=9088
-# dubbo服务化使用开关flag
+# dubbo锟斤拷锟斤拷使锟矫匡拷锟斤拷flag
 dubbo.use=false
 #JPA
-spring.profiles.active = prod
+spring.profiles.active = dev
 spring.view.suffix=.html
 server.session-timeout=-1
-#station.mysql.driver= com.mysql.jdbc.Driver
-#station.mysql.url= jdbc:mysql://127.0.0.1/school_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-#station.mysql.username= root
-#station.mysql.password= root
-
 station.mysql.driver= com.mysql.jdbc.Driver
-station.mysql.url= jdbc:mysql://172.29.0.14/school_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+station.mysql.url= jdbc:mysql://127.0.0.1/school_control_qp?useUnicode=true&characterEncoding=utf-8&useSSL=false
 station.mysql.username= root
 station.mysql.password= root
 #station.mysql.driver= com.mysql.jdbc.Driver
+#station.mysql.url= jdbc:mysql://127.0.0.1/school_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#station.mysql.username= root
+#station.mysql.password= root2jsp
+
+#station.mysql.driver= com.mysql.jdbc.Driver
 #station.mysql.url= jdbc:mysql://10.10.200.148:3306/station?useUnicode=true&characterEncoding=utf-8
 #station.mysql.username= station
 #station.mysql.password= station@jsp
@@ -5,7 +5,7 @@ datatools.kettle_properties=/datatools/kettle.properties
 # 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
 #数据库ip地址
-datatools.kvars_dbip=172.29.0.14
+datatools.kvars_dbip=127.0.0.1
 #数据库用户名
 datatools.kvars_dbuname=root
 #数据库密码
@@ -4,6 +4,6 @@
 #ms.mysql.password= root
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://172.29.0.14:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://127.0.0.1:3306/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
 ms.mysql.password= root
 \ No newline at end of file
@@ -4,7 +4,7 @@
 	<meta name="renderer" content="webkit" />
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
 	<meta charset="UTF-8">
-	<title>调度系统</title>
+	<title>练兵比武系统</title>
 	<meta http-equiv="Pragma" content="no-cache">
 	<meta http-equiv="Cache-control" content="no-cache">
@@ -181,7 +181,7 @@
 <div class="wrapper ng-scope">
     <div id="loginPanel" class="dialog dialog-shadow">
         <br>
-        <h3 class="logo-text">公交运营调度系统</h3>
+        <h3 class="logo-text">练兵比武系统</h3>
         <hr>
         <form style="padding: 0px 35px;">
             <div class="form-group" style="margin-bottom: 0">
@@ -435,10 +435,10 @@
 </script>
 <script type="text/html" id="ludan_1">
 	  <tr>
-          <td colspan="14">行车路单</td>
+          <td colspan="15">行车路单</td>
       </tr>
       <tr>
-          <td colspan="14">路别:{{xlName}}   路牌:{{lpName}}   车号:{{clZbh}}({{plate}})   出场时间:{{fcsjActual}}   到达站名:{{zdzName}}   当班调派:{{dbdp}}   日期:{{scheduleDate}}</td>
+          <td colspan="15">路别:{{xlName}}   路牌:{{lpName}}   车号:{{clZbh}}({{plate}})   出场时间:{{fcsjActual}}   到达站名:{{zdzName}}   当班调派:{{dbdp}}   日期:{{scheduleDate}}</td>
       </tr>
       <tr>
 		{{if type==0}}  
@@ -492,7 +492,7 @@
           <td colspan="2">工号</td>
           <td rowspan="2">公里耗油</td>
           <td colspan="2">起讫站</td>
-          <td colspan="4">时间</td>
+          <td colspan="5">时间</td>
           <td colspan="2">误点</td>
           <td rowspan="2" width="66px">里程(公里)计划</td>
           <td rowspan="2">备注</td>
@@ -503,6 +503,7 @@
           <td colspan="1">起点</td>
           <td colspan="1">终点</td>
           <td colspan="1">计发</td>
+		  <td colspan="1">待发</td>
           <td colspan="1">实发</td>
           <td colspan="1">应到</td>
           <td colspan="1">实到</td>
@@ -523,6 +524,7 @@
 			<td>{{obj.qdzName}}</td>
 			<td>{{obj.zdzName}}</td>
 			<td>{{obj.fcsj}}</td>
+			<td>{{obj.dfsj}}</td>
 			<td>{{obj.fcsjActual}}</td>
 			<td>{{obj.zdsj}}</td>
 			<td>{{obj.zdsjActual}}</td>
@@ -547,7 +549,7 @@
 <script type="text/html" id="ludan_3">
 	<tr>
 		<td colspan="2">计划班次</td>
-		<td>{{jhbc}}</td>
+		<td colspan="2">{{jhbc}}</td>
 		<td colspan="2">计划公里</td>
 		<td>{{jhlc}}</td>
 		<td colspan="2">烂班班次</td>
@@ -557,7 +559,7 @@
 	</tr>
 	<tr>
 		<td colspan="2">临加班次</td>
-		<td>{{ljbc}}</td>
+		<td colspan="2">{{ljbc}}</td>
 		<td colspan="2">临加公里</td>
 		<td>{{addMileage}}</td>
 		<td colspan="2">实际班次</td>
@@ -567,7 +569,7 @@
 	</tr>
 	<tr>
 		<td colspan="2">空驶公里</td>
-		<td>{{zkslc}}</td>
+		<td colspan="2">{{zkslc}}</td>
 		<td colspan="2">总公里</td>
 		<td>{{realMileage}}</td>
 		<td colspan="2"></td>
@@ -85,7 +85,7 @@
 							if(s.id==i){
 								subjectTextStr+='题'+index+':'+s.subjectText+'\n';
 								operateTestStr+='题'+index+':'+s.operateTest+'\n';
-								htmlSrt+='<row style="display: inline-block"><span class="col-md-1" className="item-label" style="width: 80px">题'+index+': </span><input class="col-md-1" class="" type="text" oninput="value=value.replace(/[^\\d]/g,\'\')" name="fraction" style="border: 1px solid #c2cad8;width: 50px;"/></row>'
+								htmlSrt+='<row style="display: inline-block"><span class="col-md-1" className="item-label" style="width: 80px">题'+index+': </span><input class="col-md-1" class="" type="text" oninput="value=value.replace(/[^\\d]/g,\'\')" name="fraction" value="10" style="border: 1px solid #c2cad8;width: 50px;"/></row>'
 							}
 							index++;
 						}
@@ -23,7 +23,7 @@
 .line_schedule .uk-grid.top-container {
     height: calc(100% - 250px);
-    margin-top: 5px;
+    margin-top: -1px;
     overflow: hidden;
 }
@@ -62,12 +62,13 @@ var su_subject = (function () {
                     //判断答题是否正确  返回参数   返回下一题的情况
                     gb_common.$get('/subjectUser/determine', {id: id},function (rs) {
                         if (rs == 0){ //提示答题正确
-                            notify_succ('答题正确！');
+                            //notify_succ('答题正确！');
                         }else if(rs == 1){ //提示答题失败
-                            notify_err('答题错误！');
+                           //notify_err('答题错误！');
                         }else { //系统出错
                         }
+                        notify_succ('已提交！');
                         ks();
                     });
@@ -9,19 +9,19 @@ var gb_sch_websocket = (function () {
     var recInterval = null;
     var reConnSpace = 1500;//重连间隔
     var reConnCount; //重连次数
-    var maxReConn = 6; //最多重连次数
+    var maxReConn = 0; //最多重连次数
     var new_conn = function () {
         schSock = new SockJS('/sockjs/realcontrol');
         schSock.onopen = function (e) {
             if(reConnCount && reConnCount > 1){
-                gb_schedule_table.refreshAll();
+                //gb_schedule_table.refreshAll();
                 console.log('重新连接，刷新班次');
             }
             reConnCount = 1;
-            clearInterval(recInterval);
+            //clearInterval(recInterval);
             console.log('webSocket[realcontrol] onopen');
-            $('body>.north').removeClass('scok-colse');
-            setTimeout(regListen, 500);
+            //$('body>.north').removeClass('scok-colse');
+            //setTimeout(regListen, 500);
         };
         //接收消息
@@ -39,17 +39,17 @@ var gb_sch_websocket = (function () {
         //断开
         schSock.onclose = function (e) {
             console.log('和服务器连接断开....', e);
-            $('body>.north').addClass('scok-colse');
+            //$('body>.north').addClass('scok-colse');
             //1.5秒后重新连接
-            recInterval = setTimeout(function () {
+           /* recInterval = setTimeout(function () {
                 reConnCount++;
                 if(reConnCount > maxReConn){
                     $('body>.north').addClass('re_conn_error');
                     clearInterval(recInterval);
                     return;
                 }
-                new_conn();
-            }, reConnSpace * reConnCount);
+                //new_conn();
+            }, reConnSpace * reConnCount);*/
         };
     };
@@ -55,7 +55,7 @@
         <div class="uk-width-4-10">
             <div class="uk-panel">
                 <h2 class="north-logo">
-                    <!--<i class="uk-icon-life-ring"></i>--> 公共交通运营调度教学资源系统
+                    <!--<i class="uk-icon-life-ring"></i>--> 练兵比武系统
                 </h2>
             </div>
         </div>
@@ -74,16 +74,16 @@
 <!-- #### 考试 start ###  --> 
 <script id="suject_pop_wrap" type="text/html">
-    <div class="north_suject" style="margin-top: -20px">
+    <div class="north_suject" style="margin-top: -35px">
         <div class="north-tmx">
              &nbsp;&nbsp;&nbsp;
             当前状态：
             {{if result== 0 }}
-            答题正确
+            已答题
             {{else if result== 1}}
-            答题错误
+            已答题
             {{else}}
             未答题
             {{/if}}
@@ -96,19 +96,25 @@
         </div>
         <div class="north-tm">
-            场景：{{subjectId.subjectText}}
+            场景： {{subjectId.schStatus == 4 ? '':'(1505路)'}}{{subjectId.subjectText}}
         </div>
         <div class="north-tm">
-            操作：{{subjectId.reason}}
+            操作：
+            {{if subjectId.dir == 0}}
+            (上行)
+            {{else if subjectId.dir == 1}}
+            (下行)
+            {{/if}}
+            {{subjectId.reason}}
         </div>
         <div class="north-tmx" style="visibility: {{isOperateTest == 1 ? 'hidden':'visible'}}" >
-             答案：({{subjectId.dir == 0 ? '上行':'下行'}}){{subjectId.operateTest}}
+             答案：{{subjectId.operateTest}}
         </div>
             <button id="submitUp" class="north-buttonUp" style="margin-left: 32%;" data-index="{{index}}">上一题</button>
             <button id="submitDown" class="north-buttonDown" data-index="{{index}}" data-number="{{number}}">下一题</button>
-        <div class="north-button">
+        <div class="north-button" disabled="">
             <button id="submit" class="subject_button" data-id="{{id}}">提交</button>
         </div>
     </div>