|
@@ -364,10 +364,11 @@ public class IotRunHaoSfServiceImpl extends IIotSfCommService {
|
|
|
params.put("devBid", devBid);
|
|
params.put("devBid", devBid);
|
|
|
|
|
|
|
|
IotRunHaoSfdata iotRunHaoSfdata = (IotRunHaoSfdata) mongoService.findOne(IotRunHaoSfdata.class, params, "sfdataCreatedDate", "desc");
|
|
IotRunHaoSfdata iotRunHaoSfdata = (IotRunHaoSfdata) mongoService.findOne(IotRunHaoSfdata.class, params, "sfdataCreatedDate", "desc");
|
|
|
- JSONObject dataJson = new JSONObject();
|
|
|
|
|
- if (iotRunHaoSfdata != null) {
|
|
|
|
|
- dataJson = iotRunHaoSfdata.getSfdataContent();
|
|
|
|
|
|
|
+ if(iotRunHaoSfdata == null){
|
|
|
|
|
+ return new JSONObject();
|
|
|
}
|
|
}
|
|
|
|
|
+ JSONObject dataJson = iotRunHaoSfdata.getSfdataContent();
|
|
|
|
|
+
|
|
|
String[] keys = new String[]{"Num-dqqf", "Num-ggsj", "Num-fqs", "Num-lgjg", "Num-lgcs", "Btn-yjqd", "Btn-zdsd"};
|
|
String[] keys = new String[]{"Num-dqqf", "Num-ggsj", "Num-fqs", "Num-lgjg", "Num-lgcs", "Btn-yjqd", "Btn-zdsd"};
|
|
|
String[] feiKeys = new String[]{"Num-fsjA", "Num-fsjB", "Num-fsjC", "Num-fsjD"};
|
|
String[] feiKeys = new String[]{"Num-fsjA", "Num-fsjB", "Num-fsjC", "Num-fsjD"};
|
|
|
JSONObject runStatus = new JSONObject();
|
|
JSONObject runStatus = new JSONObject();
|