|
@@ -36,6 +36,16 @@ public class FormController extends BaseController {
|
|
|
private FormService formService;
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
+ * 2021-06-21
|
|
|
+ */
|
|
|
+ @ApiOperation("批量导出二维码")
|
|
|
+ @GetMapping("exportQrCode")
|
|
|
+ public Result exportQrCode() {
|
|
|
+ return formService.exportQrCode();
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
@ApiOperation("列表")
|
|
|
@PostMapping("list")
|
|
|
public Result<FormEntity> list(@RequestBody PageDto param) {
|
|
@@ -55,7 +65,9 @@ public class FormController extends BaseController {
|
|
|
|
|
|
// 处理二维码, 没有示例表单不生成二维码
|
|
|
if (StringUtils.isNotBlank(param.getSampleUrl())) {
|
|
|
- String qrCodeUrl = QrCodeUtils.generateQrCode(param.getSampleUrl(), FILE_PATH, OSS_PATH, OSS_DOMAIN);
|
|
|
+// String qrCodeUrl = QrCodeUtils.generateQrCode(param.getSampleUrl(), FILE_PATH, OSS_PATH, OSS_DOMAIN);
|
|
|
+ String qrCodeUrl = QrCodeUtils.generateQrCode(
|
|
|
+ param.getSampleUrl(), configConstant.serverBasePath, configConstant.ossBasePath, configConstant.ossDomain);
|
|
|
entity.setQrCodeUrl(qrCodeUrl);
|
|
|
}
|
|
|
|
|
@@ -72,7 +84,9 @@ public class FormController extends BaseController {
|
|
|
|
|
|
// 处理二维码
|
|
|
if (param.getChange() == 1) {
|
|
|
- String qrCodeUrl = QrCodeUtils.generateQrCode(param.getSampleUrl(), FILE_PATH, OSS_PATH, OSS_DOMAIN);
|
|
|
+// String qrCodeUrl = QrCodeUtils.generateQrCode(param.getSampleUrl(), FILE_PATH, OSS_PATH, OSS_DOMAIN);
|
|
|
+ String qrCodeUrl = QrCodeUtils.generateQrCode(
|
|
|
+ param.getSampleUrl(), configConstant.serverBasePath, configConstant.ossBasePath, configConstant.ossDomain);
|
|
|
entity.setQrCodeUrl(qrCodeUrl);
|
|
|
}
|
|
|
entity.setUpdateTime(new Date());
|
|
@@ -126,7 +140,8 @@ public class FormController extends BaseController {
|
|
|
log.error("文件不能为空");
|
|
|
return Result.failure("文件不能为空");
|
|
|
}
|
|
|
- Object s = FileUtils.renameUploadOssMap(file, FILE_PATH, OSS_PATH, OSS_DOMAIN ,type, code);
|
|
|
+// Object s = FileUtils.renameUploadOssMap(file, FILE_PATH, OSS_PATH, OSS_DOMAIN ,type, code);
|
|
|
+ Object s = FileUtils.renameUploadOssMap(file, configConstant.serverBasePath, configConstant.ossBasePath, configConstant.ossDomain ,type, code);
|
|
|
return Result.success(s);
|
|
|
}
|
|
|
|