新增 获取水肥机灌溉记录列表接口

src/main/java/com/yunfeiyun/agmp/iotm/device/sf/service/impl/IotRunHaoSfServiceImpl.java

@@ -375,6 +375,13 @@ public class IotRunHaoSfServiceImpl extends IIotSfCommService {
                 }catch (Exception e){}
             }
         }
+        String dqqf = "Num-dqqf";
+        String v = runStatus.getString(dqqf);
+        String sfCode = null;
+        if(v != null && !v.equals("0")){
+            sfCode = String.format("Btn-qx%02d", Integer.parseInt(v));
+        }
+        runStatus.put("sfCode", sfCode);
         runStatus.put("sfdataBid", iotRunHaoSfdata.getSfdataBid());
         return runStatus;
     }
@@ -815,9 +822,17 @@ public class IotRunHaoSfServiceImpl extends IIotSfCommService {
             }
         }
 
-        reqVo.setCmd(CmdDef.RunHaoSfCmdDef.CMD_CONFIG);
-        reqVo.setIotDevice(iotDevice);
-        return sendConfigCmd(reqVo);
+        if(devConfig.containsKey(runStatus)){
+            devConfig.put("Num-dqqf", "0");
+        }
+
+        IotSfConfigCmdReqVo cmdReqVo = new IotSfConfigCmdReqVo();
+        cmdReqVo.setDevBid(devBid);
+        cmdReqVo.setCmd(CmdDef.RunHaoSfCmdDef.CMD_CONFIG);
+        cmdReqVo.setIotDevice(iotDevice);
+        cmdReqVo.setData(devConfig);
+
+        return sendConfigCmd(cmdReqVo);
     }
 
 
@@ -984,6 +999,7 @@ public class IotRunHaoSfServiceImpl extends IIotSfCommService {
 
         List<IotSfElementfactorAlreadyListResVo> groupList = new ArrayList<>();
         JSONObject sendJson = new JSONObject();
+        String dqqf = "0";
         for(IotSfElementfactorAlreadyListResVo elementfactor : elementfactorList){
             String sfCode = elementfactor.getSfCode();
             if(!data.containsKey(sfCode)){
@@ -994,7 +1010,17 @@ public class IotRunHaoSfServiceImpl extends IIotSfCommService {
             }
             sendJson.put(sfCode, "1");
             groupList.add(elementfactor);
+            if("0".equals(dqqf) && sfCode.startsWith("Btn-qx")){
+                try{
+                    dqqf = String.format("%d", Integer.parseInt(sfCode.replace("Btn-qx", "")));
+                }catch (Exception e){
+                    throw new IotBizException(IotErrorCode.PARAM_INVALID.getCode(), "灌区编号错误");
+                }
+            }
         }
+
+        sendJson.put("Num-dqqf", dqqf);
+
         if(sendJson.isEmpty()){
             throw new IotBizException(IotErrorCode.PARAM_INVALID.getCode(), "请先选择灌区");
         }