答题失败后增加失败原因

ljq
1 parent fb52a37a
Showing 7 changed files with 228 additions and 90 deletions
src/main/java/com/bsth/entity/subject/SubjectUser.java
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/rtMessage.java
src/main/java/com/bsth/util/subject/subEnum.java
src/main/java/com/bsth/util/subject/subEnumDevice.java
src/main/resources/application-dev.properties
@@ -29,6 +29,8 @@ public class SubjectUser {
     // 修改人
     private Integer updateBy;
+    
+    private String remark;
     /** 创建日期 timestamp  */
     @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
@@ -109,4 +111,12 @@ public class SubjectUser {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }
@@ -17,8 +17,8 @@ public interface SubjectUserRepository extends BaseRepository&lt;SubjectUser, Integ
     List<SubjectUser> userAll(String rq, Integer userId);
     @Transactional
     @Modifying
-    @Query(value = "update SubjectUser su set  su.result =?1,su.updateBy = ?2,su.updateDate = ?3  where  su.id =?4")
-    int updates(String result, Integer id, Date updateDate, Integer userId);
+    @Query(value = "update SubjectUser su set  su.result =?1,su.updateBy = ?2,su.updateDate = ?3,su.remark =?4 where  su.id =?5")
+    int updates(String result, Integer id, Date updateDate,String remark, 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 ) "
@@ -81,36 +81,42 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer
         //类型
         String type = sur.getSubjectId().getType();
-       
+        Map m = new HashMap();
+        String remark="";
         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";
+            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);
-             result = sjm.run(sur,sch) == true ? "0" : "1";
+            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();//查看当日缓存指令
-            
-            result =  sjmdrivce.run(sur,yyArray,user) == true ? "0" : "1";
+            m = sjmdrivce.run(sur,yyArray,user);
+            result = new Boolean(m.get("state").toString()) == true ? "0" : "1";
         }
+        if (m.get("message") != null)
+            remark = m.get("message").toString();
+        
         SimpleDateFormat formatter = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss");
         Date date = new Date();
         // 修改日期
-        String updateDate = formatter.format(date);
         //修改答案
-        int status  = subjectUserRepository.updates(result,user.getId(),date,id);
-        //List list = subjectUserRepository.userAll(sur.getRq(),sur.getUserId());
-       // map.put("result",result);
-        //map.put("list",list);
+        int status  = subjectUserRepository.updates(result,user.getId(),date,remark,id);
+        
         if (status == 1){
             return result;
         }
+package com.bsth.util.subject;
+
+public class rtMessage {
+    
+    static String DF_ERROR = "待发时间与规定不匹配";
+
+    static String LB_ERROR = "未成功烂班";
+
+    static String CLB_ERROR = "未成功烂班后撤销烂班";
+
+    static String JGS_ERROR = "后续三个班次间隔时间未合理";
+
+    static String SF_ERROR = "班次未成功实发";
+    
+    static String CSF_ERROR = "班次未成功实发后撤销实发";
+    
+    static String ZF_RROR = "班次未直放";
+
+    static String FZ_ERROR = "班次未放站";
+
+    static String ZRW_ERROR = "未有子任务或子任务站点未对应";
+    
+    static String LJBC_ERROR = "未有正确的临加班次";
+    
+    static String LJBC_WF_ERROR = "未有正确的往返班次";
+    
+    static String LJBC_CDC_ERROR = "未有正确的场到场班次";
+
+    static String LP_ERROR = "未成功临加路牌并在该路牌上临加班次";
+
+    static String J_GH_ERROR = "备选驾驶员未成功更换";
+    
+    static String HB_ERROR = "驾驶员未成功更换";
+    
+    static String PDF_ERROR = "三个班次未全部成功待发调整正确";
+    
+    static String PWD_ERROR = "误点调整未批量";
+    
+    static String QDIR_ERROR = "车辆未成功切换下行";
+    
+    static String XF_ERROR = "车辆未成功下发消息";
+    
+    static String PXF_ERROR = "未给多辆车下发消息 ";
+    
+}
@@ -6,35 +6,37 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.subject.SubjectUser;
 import java.text.SimpleDateFormat;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 public enum subEnum {
-   
+ 
     //判断待发
     df{ 
         @Override
-        public boolean run(SubjectUser sur, List<ScheduleRealInfo> sch){
+        public Map run(SubjectUser sur, List<ScheduleRealInfo> sch){
+            Map m = new HashMap();
             String sj = sur.getSubjectId().getFcsj();//计划发车时间
             String answer = sur.getSubjectId().getAnswer();//待发是按
             //判断结果是否合格
             for (ScheduleRealInfo s : sch) {
                 if (s.getFcsj().equals(sj) &&
                         s.getDfsj().equals(answer)) {
-                    return true;
+                    m.put("state",true);
+                    return m;
                 }
             }
-            return false;
+            m.put("state",false);
+            m.put("message",rtMessage.DF_ERROR);
+            return m;
         }
     },
     //判断烂班
     lb{  
         @Override
-        public boolean run(SubjectUser sur, List<ScheduleRealInfo> sch){
+        public Map run(SubjectUser sur, List<ScheduleRealInfo> sch){
+            Map m = new HashMap();
             String sj = sur.getSubjectId().getFcsj();//计划发车时间
             String answer = sur.getSubjectId().getAnswer();//答案
             String[] t = answer.split(","); //0 计划里程  1 是否烂班状态 2烂班原因
@@ -44,16 +46,20 @@ public enum subEnum {
                         s.getJhlc() == Double.parseDouble(t[0]) &&
                         s.getStatus() == Integer.parseInt(t[1]) &&
                         s.getRemarks().contains(t[2])) {
-                    return true;
+                    m.put("state",true);
+                    return m;
                 }
             }
-            return false;
+            m.put("state",false);
+            m.put("message",rtMessage.LB_ERROR);
+            return m;
         }
     },
     //判断烂班后撤销烂班
     clb{   
         @Override
-        public boolean run(SubjectUser sur, List<ScheduleRealInfo> sch){
+        public Map run(SubjectUser sur, List<ScheduleRealInfo> sch){
+            Map m = new HashMap();
             String sj = sur.getSubjectId().getFcsj();//计划发车时间
             String answer = sur.getSubjectId().getAnswer();//答案
             String[] t = answer.split(","); //0 是否烂班状态 1是否烂班过
@@ -65,15 +71,20 @@ public enum subEnum {
                 if (s.getDfsj().equals(sj) &&
                         s.getStatus() == Integer.parseInt(t[0]) &&
                          t[1].equals(s.getAdjustExps())) {
-                    return true;
+                    m.put("state",true);
+                    return m;
                 }
             }
-            return false;
+            m.put("state",false);
+            m.put("message",rtMessage.CLB_ERROR);
+            return m;
         }
     },
+    //多个发车间隔
     jgs{
         @Override
-        public boolean run(SubjectUser sur, List<ScheduleRealInfo> sch){
+        public Map run(SubjectUser sur, List<ScheduleRealInfo> sch){
+            Map m = new HashMap();
             String sj = sur.getSubjectId().getFcsj();//计划发车时间
             String answer = sur.getSubjectId().getAnswer();//答案
             String[] t = answer.split(","); //0 里程是否清0  1 是否烂班状态 2烂班原因3.班次间隔时间
@@ -109,19 +120,23 @@ public enum subEnum {
                 }
                 //3个班次都正确
                 if (sunm == 3){
-                    return true;
+                    m.put("state",true);
+                    return m;
                 }
             }catch (Exception e){
                 e.printStackTrace();
             }
-            return false;
+            m.put("state",false);
+            m.put("message",rtMessage.JGS_ERROR);
+            return m;
         }
     },    //判断烂班
     //实发
     sf{
         @Override
-        public boolean run(SubjectUser sur, List<ScheduleRealInfo> sch){
+        public Map run(SubjectUser sur, List<ScheduleRealInfo> sch){
+            Map m = new HashMap();
             String sj = sur.getSubjectId().getFcsj();//计划发车时间
             String answer = sur.getSubjectId().getAnswer();//答案
             String[] t = answer.split(","); //0 实发时间 1调整说明
@@ -130,16 +145,20 @@ public enum subEnum {
                 if (s.getDfsj().equals(sj) &&
                         t[0].equals(s.getFcsjActual()) &&
                         s.getRemarks().contains(t[1])) {
-                    return true;
+                    m.put("state",true);
+                    return m;
                 }
             }
-            return false;
+            m.put("state",false);
+            m.put("message",rtMessage.SF_ERROR);
+            return m;
         }
     },
     //撤销实发
     csf {
         @Override
-        public boolean run(SubjectUser sur, List<ScheduleRealInfo> sch) {
+        public Map run(SubjectUser sur, List<ScheduleRealInfo> sch) {
+            Map m = new HashMap();
             String sj = sur.getSubjectId().getFcsj();//计划发车时间
             String answer = sur.getSubjectId().getAnswer();//答案
             String[] t = answer.split(","); //0 调整说明
@@ -149,16 +168,20 @@ public enum subEnum {
                         s.getFcsjActual() == null &&
                         s.getRemarks() != null &&
                         s.getRemarks().contains(t[0])) {
-                    return true;
+                    m.put("state",true);
+                    return m;
                 }
             }
-            return false;
+            m.put("state",false);
+            m.put("message",rtMessage.CSF_ERROR);
+            return m;
         }
     },
     //直放
     zf {
         @Override
-        public boolean run(SubjectUser sur, List<ScheduleRealInfo> sch) {
+        public Map run(SubjectUser sur, List<ScheduleRealInfo> sch) {
+            Map m = new HashMap();
             String sj = sur.getSubjectId().getFcsj();//计划发车时间
             String answer = sur.getSubjectId().getAnswer();//答案
             String[] t = answer.split(","); //0 放站
@@ -166,16 +189,20 @@ public enum subEnum {
             for (ScheduleRealInfo s : sch) {
                 if (s.getDfsj().equals(sj) &&
                         s.getBcType().equals(t[0])) {
-                    return true;
+                    m.put("state",true);
+                    return m;
                 }
             }
-            return false;
+            m.put("state",false);
+            m.put("message",rtMessage.ZF_RROR);
+            return m;
         }
     },
     //放站
     fz {
         @Override
-        public boolean run(SubjectUser sur, List<ScheduleRealInfo> sch) {
+        public Map run(SubjectUser sur, List<ScheduleRealInfo> sch) {
+            Map m = new HashMap();
             String sj = sur.getSubjectId().getFcsj();//计划发车时间
             String answer = sur.getSubjectId().getAnswer();//答案
             String[] t = answer.split(","); //0 放站 1备注-是不是龙阳路地铁站
@@ -185,16 +212,20 @@ public enum subEnum {
                         s.getBcType().equals(t[0]) &&
                         s.getRemarks() != null &&
                         s.getRemarks().contains(t[1])) {
-                    return true;
+                    m.put("state",true);
+                    return m;
                 }
             }
-            return false;
+            m.put("state",false);
+            m.put("message",rtMessage.FZ_ERROR);
+            return m;
         }
     },
     //子任务
     zrw {
         @Override
-        public boolean run(SubjectUser sur, List<ScheduleRealInfo> sch) {
+        public Map run(SubjectUser sur, List<ScheduleRealInfo> sch) {
+            Map m = new HashMap();
             String sj = sur.getSubjectId().getFcsj();//计划发车时间
             String answer = sur.getSubjectId().getAnswer();//答案
             String[] t = answer.split(","); //0 放站 1备注-是不是龙阳路地铁站
@@ -216,19 +247,23 @@ public enum subEnum {
                     }
                     //判断子任务里程数和班次里程数是否一样  && 满足两个班次
                     if (lc == s.getJhlc().floatValue() && sn == 2) {
-                       return true;
+                       m.put("state",true);
+                    return m;
                     }
                 }
             }
-            return false;
+            m.put("state",false);
+            m.put("message",rtMessage.ZRW_ERROR);
+            return m;
         }
     },
     //临加班次
     ljbc{
         @Override
-        public boolean run(SubjectUser sur, List<ScheduleRealInfo> sch){
+        public Map run(SubjectUser sur, List<ScheduleRealInfo> sch){
+            Map m = new HashMap();
             String sj = sur.getSubjectId().getFcsj();//计划发车时间
             String answer = sur.getSubjectId().getAnswer();//答案
             String[] t = answer.split(","); //0
@@ -248,7 +283,8 @@ public enum subEnum {
                     }
                     //判断是否有这个临加班次
                     if (s.getDfsj().equals(df) && s.getClZbh().contains(t[1]) && s.isSflj() == true) {
-                        return true;
+                        m.put("state",true);
+                    return m;
                     }
                 }
@@ -256,13 +292,16 @@ public enum subEnum {
                 e.printStackTrace();
             }
-            return false;
+            m.put("state",false);
+            m.put("message",rtMessage.LJBC_ERROR);
+            return m;
         }
     },
     //临加班次 往返班次
     ljbc_wf{
         @Override
-        public boolean run(SubjectUser sur, List<ScheduleRealInfo> sch){
+        public Map run(SubjectUser sur, List<ScheduleRealInfo> sch){
+            Map m = new HashMap();
             String sj = sur.getSubjectId().getFcsj();//计划发车时间
             String answer = sur.getSubjectId().getAnswer();//答案
             String[] t = answer.split(","); //0
@@ -287,7 +326,8 @@ public enum subEnum {
                         dfsj =s.getZdsj();
                     }
                     if(s.getDfsj().equals(dfsj) && s.isSflj() == true){
-                        return true;
+                        m.put("state",true);
+                    return m;
                     }
@@ -296,13 +336,16 @@ public enum subEnum {
                 e.printStackTrace();
             }
-            return false;
+            m.put("state",false);
+            m.put("message",rtMessage.LJBC_WF_ERROR);
+            return m;
         }
     },
     //临加班次 场到场
     ljbc_cdc{
         @Override
-        public boolean run(SubjectUser sur, List<ScheduleRealInfo> sch){
+        public Map run(SubjectUser sur, List<ScheduleRealInfo> sch){
+            Map m = new HashMap();
             String sj = sur.getSubjectId().getFcsj();//计划发车时间
             String answer = sur.getSubjectId().getAnswer();//答案
             String[] t = answer.split(","); //0
@@ -327,20 +370,24 @@ public enum subEnum {
                     }
                 }
                 if(nts == 2){
-                    return true;
+                    m.put("state",true);
+                    return m;
                 }
             }catch (Exception e){
                 e.printStackTrace();
             }
-            return false;
+            m.put("state",false);
+            m.put("message",rtMessage.LJBC_CDC_ERROR);
+            return m;
         }
     },
     //临加班次 场到场
     lp{
         @Override
-        public boolean run(SubjectUser sur, List<ScheduleRealInfo> sch){
+        public Map run(SubjectUser sur, List<ScheduleRealInfo> sch){
+            Map m = new HashMap();
             String sj = sur.getSubjectId().getFcsj();//计划发车时间
             String answer = sur.getSubjectId().getAnswer();//答案
             String[] t = answer.split(","); //0
@@ -354,7 +401,8 @@ public enum subEnum {
                     ScheduleRealInfo s = sch.get(i);
                     //判断当前班次是否符合条件  全部班次
                     if ( s.getDfsj().equals(sj) && s.getLpName().equals(t[0]) && s.isSflj() == true) {
-                        return true;
+                        m.put("state",true);
+                    return m;
                     }
                 }
@@ -362,13 +410,16 @@ public enum subEnum {
                 e.printStackTrace();
             }
-            return false;
+            m.put("state",false);
+            m.put("message",rtMessage.LP_ERROR);
+            return m;
         }
     },  
-    //临加班次 场到场
+    //替换代班驾驶员
     j_gh{
         @Override
-        public boolean run(SubjectUser sur, List<ScheduleRealInfo> sch){
+        public Map run(SubjectUser sur, List<ScheduleRealInfo> sch){
+            Map m = new HashMap();
             String sj = sur.getSubjectId().getFcsj();//计划发车时间
             String answer = sur.getSubjectId().getAnswer();//答案
             String[] t = answer.split(","); //0
@@ -382,7 +433,8 @@ public enum subEnum {
                     ScheduleRealInfo s = sch.get(i);
                     //判断当前班次是否符合条件  全部班次
                     if ( s.getDfsj().equals(sj) && s.getjGh().equals(t[0])) {
-                        return true;
+                        m.put("state",true);
+                    return m;
                     }
                 }
@@ -390,13 +442,16 @@ public enum subEnum {
                 e.printStackTrace();
             }
-            return false;
+            m.put("state",false);
+            m.put("message",rtMessage.J_GH_ERROR);
+            return m;
         }
     },
     //换班
     hb{
         @Override
-        public boolean run(SubjectUser sur, List<ScheduleRealInfo> sch){
+        public Map run(SubjectUser sur, List<ScheduleRealInfo> sch){
+            Map m = new HashMap();
             String sj = sur.getSubjectId().getFcsj();//计划发车时间
             String answer = sur.getSubjectId().getAnswer();//答案
             String[] t = answer.split(","); //0
@@ -418,20 +473,24 @@ public enum subEnum {
                     }
                 }
                 if(su == 2)
-                    return true;
+                    m.put("state",true);
+                    return m;
             }catch (Exception e){
                 e.printStackTrace();
             }
-            return false;
+            m.put("state",false);
+            m.put("message",rtMessage.HB_ERROR);
+            return m;
         }
     },
     //批量修改待发
     pdf{
         @Override
-        public boolean run(SubjectUser sur, List<ScheduleRealInfo> sch){
+        public Map run(SubjectUser sur, List<ScheduleRealInfo> sch){
+            Map m = new HashMap();
             String sj = sur.getSubjectId().getFcsj();//计划发车时间
             String answer = sur.getSubjectId().getAnswer();//答案
             String[] t = answer.split(","); //0
@@ -455,21 +514,25 @@ public enum subEnum {
                     }
                 }
                 if(sunm == 3)
-                    return true;
+                    m.put("state",true);
+                    return m;
             }catch (Exception e){
                 e.printStackTrace();
             }
-            return false;
+            m.put("state",false);
+            m.put("message",rtMessage.PDF_ERROR);
+            return m;
         }
     },
     //批量误点调整
     pwd{
         @Override
-        public boolean run(SubjectUser sur, List<ScheduleRealInfo> sch){
+        public Map run(SubjectUser sur, List<ScheduleRealInfo> sch){
+            Map m = new HashMap();
             String sj = sur.getSubjectId().getFcsj();//计划发车时间
             String answer = sur.getSubjectId().getAnswer();//答案
             String[] t = answer.split(","); //0
@@ -493,16 +556,20 @@ public enum subEnum {
                         sunm = stn == Integer.parseInt(t[0]) ? sunm + 1 : sunm;  //班次调整待发延后10分
                     }
                 }
-                if(sunm == 3)
-                    return true;
+                if(sunm == 3) {
+                    m.put("state", true);
+                    return m;
+                }
             }catch (Exception e){
                 e.printStackTrace();
             }
-            return false;
+            m.put("state",false);
+            m.put("message",rtMessage.PWD_ERROR);
+            return m;
         }
     };
-    public abstract boolean run(SubjectUser sur, List<ScheduleRealInfo> sch);
+    public abstract Map run(SubjectUser sur, List<ScheduleRealInfo> sch);
 }
@@ -8,10 +8,7 @@ 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.*;
 import java.util.stream.Collectors;
 public enum subEnumDevice {
@@ -20,48 +17,61 @@ public enum subEnumDevice {
     //手动切换车辆方向
     qdir{ 
         @Override
-        public boolean run(SubjectUser sur, Collection<D60> yyArray,SysUser user){
+        public Map run(SubjectUser sur, Collection<D60> yyArray,SysUser user){
+            Map m = new HashMap();
             for (D60 d60 : yyArray){
                 if (d60.getSender().equals(user.getUserName())){ //用户名
                     if(d60.getData().getTxtContent().equals("切换为 下行营运")){
-                        return true;
+                        m.put("state",true);
+                    return m;
                     }
                 }
             }
-            return false;
+            m.put("state",false);
+            m.put("message",rtMessage.QDIR_ERROR);
+            return m;
         }
     },
-    //手动切换车辆方向
+    //下发消息
     xf{
         @Override
-        public boolean run(SubjectUser sur, Collection<D60> yyArray,SysUser user){
+        public Map run(SubjectUser sur, Collection<D60> yyArray, SysUser user){
+            Map m = new HashMap();
             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;
+                    m.put("state",true);
+                    return m;
                 }
             }
-            return false;
+            m.put("state",false);
+            m.put("message",rtMessage.XF_ERROR);
+            return m;
         }
     },
-    //手动切换车辆方向
+    //群下发消息
     pxf{
         @Override
-        public boolean run(SubjectUser sur, Collection<D60> yyArray,SysUser user){
+        public Map run(SubjectUser sur, Collection<D60> yyArray,SysUser user){
+            Map m = new HashMap();
             int num = 0;
             for (D60 d60 : yyArray){
                 if (d60.getDeviceId().contains(user.getUserName())){ //用户名
                     num = num + 1;
                 }
             }
-            if (num >= 5)
-                return true;
+            if (num >= 5) {
+                m.put("state", true);
+                return m;
+            }
-            return false;
+            m.put("state",false);
+            m.put("message",rtMessage.PXF_ERROR);
+            return m;
         }
     };
-    public abstract boolean run(SubjectUser sur, Collection<D60> yyArray, SysUser user);
+    public abstract Map run(SubjectUser sur, Collection<D60> yyArray, SysUser user);
 }
@@ -40,9 +40,9 @@ jp.date = cmd /c date
 ## gps client data
 http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
 ## gateway real data
-http.gps.real.url= http://114.80.178.12:18080/transport_server/rtgps/
+http.gps.real.url= http://192.168.168.237:8080/transport_server/rtgps/
 ## gateway send directive
-http.send.directive = http://192.168.168.201:9090/transport_server/message/
+http.send.directive = http://192.168.168.237:8899/transport_server/message/
 ## rfid data
 http.rfid.url= http://114.80.178.12:29000/rfid