Selaa lähdekoodia

优化 二维码查询功能

java110 4 vuotta sitten
vanhempi
commit
cc979fe5a2

+ 1 - 1
service-common/src/main/java/com/java110/common/bmo/machine/impl/MachineOpenDoorBMOImpl.java

@@ -137,6 +137,6 @@ public class MachineOpenDoorBMOImpl implements IMachineOpenDoorBMO {
         }
 
         ResultVo resultVo = dataBusInnerServiceSMOImpl.getQRcode(reqJson);
-        return ResultVo.createResponseEntity(resultVo);
+        return ResultVo.createResponseEntity(resultVo.getCode(), resultVo.getMsg(), resultVo.getData());
     }
 }

+ 1 - 1
service-job/src/main/java/com/java110/job/adapt/hcIot/GetMachineQrCodeAdapt.java

@@ -52,6 +52,6 @@ public class GetMachineQrCodeAdapt extends DatabusAdaptImpl {
             return new ResultVo(ResultVo.CODE_ERROR, responseEntity.getBody());
         }
         JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
-        return new ResultVo(paramOut.getInteger("code"), paramOut.getString("msg"));
+        return new ResultVo(paramOut.getInteger("code"), paramOut.getString("msg"), paramOut.getString("data"));
     }
 }