diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java index 25f5e397..5a01f29e 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java @@ -709,7 +709,7 @@ public class DeviceController extends ControllerBase { devices.forEach(device -> { try { DeviceQRCodeVO vo=new DeviceQRCodeVO(); - byte[] bytes=deviceQRCodeService.generate(device.getDeviceNo(),device.getModelNo()); + byte[] bytes = deviceQRCodeService.generate(device.getDeviceNo()); vo.setDeviceNo(device.getDeviceNo()); vo.setUrl(fileUploadService.upload("temp/qrcode/device/"+IdUtil.fastUUID()+".png",new ByteArrayInputStream(bytes))); vos.add(vo); @@ -731,7 +731,7 @@ public class DeviceController extends ControllerBase { try { if (devices.size()==1){ Device device=devices.get(0); - byte[] bytes=deviceQRCodeService.generate(device.getDeviceNo(),device.getModelNo()); + byte[] bytes = deviceQRCodeService.generate(device.getDeviceNo()); HttpHeaders headers = new HttpHeaders(); headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename="+ device.getDeviceNo()+".jpg"); return ResponseEntity.ok() @@ -750,7 +750,7 @@ public class DeviceController extends ControllerBase { tds.add(device); ZipEntry zipEntry = new ZipEntry(device.getDeviceNo()+".jpg"); zos.putNextEntry(zipEntry); - byte[] bytes=deviceQRCodeService.generate(device.getDeviceNo(),device.getModelNo()); + byte[] bytes = deviceQRCodeService.generate(device.getDeviceNo()); zos.write(bytes, 0, bytes.length); zos.closeEntry(); } diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TestController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TestController.java index 7d9fba87..226840b7 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TestController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TestController.java @@ -33,10 +33,9 @@ public class TestController extends ControllerBase{ */ @GetMapping("showDeviceQRCode") public void showDeviceQRCode(HttpServletResponse response - , @RequestParam(defaultValue = "dsadwe3d3cdsd") String deviceNo - , @RequestParam(defaultValue = "sadasd") String modelNo){ + , @RequestParam(defaultValue = "dsadwe3d3cdsd") String deviceNo) { try { - byte[] bytes=deviceQRCodeService.generate(deviceNo,modelNo); + byte[] bytes = deviceQRCodeService.generate(deviceNo); response.setContentType("image/png"); response.setHeader("Content-Disposition", "attachment;filename=qrcode.png"); try (OutputStream outputStream = response.getOutputStream()) { diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/DeviceQRCodeService.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/DeviceQRCodeService.java index 390da978..27e5cc86 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/DeviceQRCodeService.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/DeviceQRCodeService.java @@ -16,8 +16,8 @@ public class DeviceQRCodeService { @Resource private IParamConfigService paramConfigService; - public byte[] generate(String deviceNo, String modelNo) throws Exception { + public byte[] generate(String deviceNo) throws Exception { ParamConfig config = paramConfigService.lambdaQuery().eq(ParamConfig::getCode, "DeviceQRCodeHost").one(); - return QRCodeUtil.generateDeviceQRCode(deviceNo, StrUtil.format(config.getValue(), deviceNo, modelNo), 550, 550); + return QRCodeUtil.generateDeviceQRCode(deviceNo, StrUtil.format(config.getValue(), deviceNo), 550, 550); } }