后端修改

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.xml

@@ -2844,7 +2844,7 @@
     <include refid="select"/>
     <include refid="whereLike"/>
     <if test="flag != null and flag != ''">
-      value_flag not in ('0', '2')
+       and value_flag not in ('0', '2')
     </if>
     order by create_time desc
   </select>

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -33,6 +33,9 @@ import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActu
 import com.steerinfo.meterwork.meterworkrailwaymotorialreceived.model.MeterWorkRailwayMotorialReceived;
 import com.steerinfo.meterwork.meterworkrailwayreceived.mapper.MeterWorkRailwayReceivedMapper;
 import com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived;
+import com.steerinfo.meterwork.meterworkrailwayscheduledhelp.model.MeterWorkRailwayScheduledHelp;
+import com.steerinfo.meterwork.meterworkrailwayscheduledhelp.service.IMeterWorkRailwayScheduledHelpService;
+import com.steerinfo.meterwork.meterworkscheduledhelp.model.MeterWorkScheduledHelp;
 import com.steerinfo.pretrack.prerailwayscale.mapper.PreRailwayScaleMapper;
 import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
 import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
@@ -72,6 +75,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     @Resource
     private MeterWorkRailwayActFirstMapper meterWorkRailwayActFirstMapper;
 
+    @Resource
+    private IMeterWorkRailwayScheduledHelpService meterWorkRailwayScheduledHelpService;
+
     @Resource
     private PreRailwayScaleMapper preRailwayScaleMapper;
 
@@ -3930,7 +3936,65 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
     @Override
     public RESTfulResult selfServiceMeasurement(MeterWorkRailwayActFirst first) {
-        return null;
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try {
+            String helpContent = "";
+            MeterWorkRailwayScheduledHelp railwayHelp = new MeterWorkRailwayScheduledHelp();
+            if(StringUtils.isEmpty(first.getRailwayNo())) {
+                helpContent = "车号为空,请联系处理";
+                meterWorkRailwayScheduledHelpService.scheduledHelp("", first.getBaseSpotNo(), first.getBaseSpotName(), helpContent);
+            }
+
+            //根据车号、电话、司机姓名获取远程求助信息
+            /*HashMap<String, Object> map = new HashMap<>();
+            map.put("carNo", carNo);
+            map.put("baseSpotNo", baseSpotNo);
+            map.put("baseSpotName", baseSpotName);
+            List<MeterWorkScheduledHelp> model = meterWorkScheduledHelpMapper.selectByParameters(map);
+            //若是远程求助信息里面没有求助信息，重新生成Id直接插入
+            if(model.size() >= 1){
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+                helpModel.setHelpId(sdf.format(new Date()));
+                helpModel.setCarNo(carNo);
+                helpModel.setBaseSpotNo(baseSpotNo);
+                helpModel.setBaseSpotName(baseSpotName);
+                helpModel.setHelpContent(helpContent);
+                helpModel.setCreateTime(new Date());
+                helpModel.setValueFlag("0");
+                int i = meterWorkScheduledHelpMapper.insertSelective(helpModel);
+                if( i > 0){
+                    rm.setSucceed();
+                    rm.setMessage("数据正在处理，请等待！！");
+                    rm.setCode("200");
+                    rm.setData(helpModel);
+                }else{
+                    rm.setMessage("操作失败");
+                    rm.setCode("500");
+                    rm.setFailed();
+                }
+            }else {  //若有求助信息，更新远程求助表
+                model.get(0).setHelpContent(helpContent);
+                model.get(0).setCreateTime(new Date());
+                model.get(0).setValueFlag("0");
+                int i = meterWorkScheduledHelpMapper.updateByPrimaryKeySelective(model.get(0));
+                if (i > 0) {
+                    rm.setSucceed();
+                    rm.setMessage("数据正在处理，请等待！！");
+                    rm.setCode("200");
+                    rm.setData(model);
+                } else {
+                    rm.setMessage("操作失败");
+                    rm.setCode("500");
+                    rm.setFailed();
+                }
+            }*/
+
+        }catch(Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作成功！！" + e.getMessage());
+        }
+        return rm;
     }
 
     public static void main(String[] args) {