diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxInstrumentController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxInstrumentController.java index 1e6ef3f..46679a7 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxInstrumentController.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxInstrumentController.java @@ -144,8 +144,8 @@ public class WxInstrumentController extends BaseController { * 1)第一位不相同的情况下,判断后面两位,后台的比设备的大,则强行升级 */ @GetMapping(value = "/upgrade") - public R upgrade(@RequestParam("instrumentId") Long instrumentId) { - return R.ok(wxInstrumentService.upgrade(instrumentId)); + public R upgrade(@RequestParam("instrumentId") Long instrumentId, @RequestParam(value = "isWe200") Boolean isWe200) { + return R.ok(wxInstrumentService.upgrade(instrumentId, isWe200)); } /** diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxInstrumentService.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxInstrumentService.java index 01b847b..a67b808 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxInstrumentService.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxInstrumentService.java @@ -29,7 +29,7 @@ public interface IWxInstrumentService { WxInstrumentSerial determineSerialIsSameInstrument(String serial, Long instrumentId); - String upgrade(Long instrumentId); + String upgrade(Long instrumentId, Boolean isWe200); WxBindingInstrumentInfo bindingInstrumentInfo(Long instrumentId); } diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java index 095af44..1296c3d 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java @@ -431,12 +431,17 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { } @Override - public String upgrade(Long instrumentId) { + public String upgrade(Long instrumentId, Boolean isWe200) { WxInstrument wxInstrument = wxInstrumentMapper.selectWxInstrumentById(instrumentId); if (wxInstrument != null && StringUtils.isNotBlank(wxInstrument.getIotUpgradeData())) { // 读取文件系统中的文件 try { - byte[] byteArray = FileCopyUtils.copyToByteArray(new URL(wxInstrument.getIotUpgradeData()).openStream()); + byte[] byteArray; + if (isWe200) { + byteArray = FileCopyUtils.copyToByteArray(new URL(wxInstrument.getWe200IotUpgradeData()).openStream()); + } else { + byteArray = FileCopyUtils.copyToByteArray(new URL(wxInstrument.getIotUpgradeData()).openStream()); + } return DatatypeConverter.printHexBinary(byteArray); } catch (FileNotFoundException e) { logger.error("instrumentId:{} 升级失败: {}", instrumentId, e.getMessage());