【慧眼EIS接口，修改吞吐量接口】

src/main/java/com/uas/eis/serviceImpl/StepWorkServiceImpl.java

@@ -121,10 +121,24 @@ public class StepWorkServiceImpl implements StepWorkService {
                         String paramName = Objects.toString(testDataMap.get("paramName"),"");
                         String duration = Objects.toString(testDataMap.get("duration"),"");
                         String description = Objects.toString(testDataMap.get("description"),"");
-                        String wifiBandwidth = Objects.toString(testDataMap.get("wifiBandwidth"),""); //频段带宽
-                        String channel = Objects.toString(testDataMap.get("channel"),""); //信道
-
-                        if(!baseDao.checkIf("prodtestparam,make","pp_prodcode=ma_prodcode AND ma_code='"+WO+"' AND pp_stepcode='"+routeCode+"' AND pp_paramname='"+paramName+"'")){
+                        String wifiBandwidth ="";
+                        String channel = "";
+                        if(testDataMap.containsKey("wifiBandwidth")) {
+                            wifiBandwidth = Objects.toString(testDataMap.get("wifiBandwidth"), ""); //频段带宽
+                        }
+                        if(testDataMap.containsKey("channel")) {
+                            channel = Objects.toString(testDataMap.get("channel"), ""); //信道
+                        }
+                        SqlRowList rs2 = baseDao.queryForRowSet("select pp_wifibandwidth,pp_channel from prodtestparam,make where pp_prodcode=ma_prodcode and ma_code=? AND pp_stepcode=? AND pp_paramname=?"
+                                ,WO,routeCode,paramName );
+                        if(rs2.next()){
+                            if(!testDataMap.containsKey("wifiBandwidth")){
+                                wifiBandwidth = rs2.getGeneralString("pp_wifibandwidth");
+                            }
+                            if(!testDataMap.containsKey("channel")){
+                                channel = rs2.getString("pp_channel");
+                            }
+                        }else{
                             return new StepWorkApiResult(false,500,"工单:"+WO+"测试参数列表,测试项目中参数名称无"+ paramName);
                         }
 
@@ -145,14 +159,14 @@ public class StepWorkServiceImpl implements StepWorkService {
                         "'"+routeCode+"', '"+eventResult+"', sysdate, sysdate FROM source WHERE sc_code = '"+stationCode+"'");
             }
 
-         /* List<String> list = baseDao.callProcedureWithOut("CS_CHECKSTEPSNANDMACODE", new Object[]{
+         List<String> list = baseDao.callProcedureWithOut("CS_CHECKSTEPSNANDMACODE", new Object[]{
                     WO, stationCode,SN,""
             }, new Integer[]{1, 2, 3, 4}, new Integer[]{5, 6, 7});
             String msg = Objects.toString(list.get(2),"");
             if(!msg.isEmpty()){
                 return new StepWorkApiResult(false,500,"过站前核对失败:"+msg);
             }
-            stepPassed(WO, stationCode, SN, "", "OK");*/
+            stepPassed(WO, stationCode, SN, "", "OK");
 
         }catch (Exception ex){
             ex.printStackTrace();