From a6ae7c44fccca62e535c763aae0e599d2f3f73b0 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 29 五月 2024 14:27:53 +0800
Subject: [PATCH] 增加通过多个base64PDF合并为一个
---
ltkj-admin/src/main/java/com/ltkj/web/tduck/UserFormSettingController.java | 284 ++++++++++++++++++++++++++++----------------------------
1 files changed, 142 insertions(+), 142 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/tduck/UserFormSettingController.java b/ltkj-admin/src/main/java/com/ltkj/web/tduck/UserFormSettingController.java
index 220de5d..f30af9b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/tduck/UserFormSettingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/tduck/UserFormSettingController.java
@@ -1,143 +1,143 @@
-//package com.ltkj.web.tduck;
-//
-//import cn.hutool.core.util.ObjectUtil;
-//import com.ltkj.common.utils.http.HttpUtils;
-//import com.ltkj.tduck.domain.UserFormSettingEntity;
-//import com.ltkj.tduck.request.CheckWritePwdRequest;
-//import com.ltkj.tduck.service.UserFormSettingService;
-//import com.ltkj.tduck.utils.CacheUtils;
-//import com.ltkj.tduck.utils.Result;
-//import lombok.RequiredArgsConstructor;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.validation.annotation.Validated;
-//import org.springframework.web.bind.annotation.*;
-//
-//import javax.annotation.security.PermitAll;
-//import javax.servlet.http.HttpServletRequest;
-//import java.util.Map;
-//
-///**
-// * 琛ㄥ崟璁剧疆
-// *
-// * @author : smalljop
-// * @description : 琛ㄥ崟璁剧疆
-// * @create : 2020-11-18 18:17
-// **/
-//@Slf4j
-//@RestController
-//@RequiredArgsConstructor
-//public class UserFormSettingController {
-//
-// private final UserFormSettingService userFormSettingService;
-//// private final WxMpUserService wxMpUserService;
-// private final CacheUtils cacheUtils;
-//// private final WxMpService wxMpService;
-//
-//
-// /**
-// * 淇濆瓨琛ㄥ崟璁剧疆
-// */
-// @PostMapping("/user/form/setting/save")
-// public Result<Boolean> saveFormSetting(@RequestBody Map<String, Object> setting) {
-// String formKey = setting.get("formKey").toString();
-//// FormAuthUtils.hasPermission(formKey);
-// return Result.success(userFormSettingService.saveFormSetting(setting));
-// }
-//
-// /**
-// * 琛ㄥ崟鎻愪氦璁剧疆鏌ヨ
-// */
-// @GetMapping("/user/form/setting/{key}")
-// public Result<Map<String, Object>> queryFormSettingByKey(@PathVariable("key") String formKey) {
-// UserFormSettingEntity setting = userFormSettingService.getFormSettingByKey(formKey);
-// if (ObjectUtil.isNull(setting)) {
-// return Result.success();
+package com.ltkj.web.tduck;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.ltkj.common.utils.http.HttpUtils;
+import com.ltkj.tduck.domain.UserFormSettingEntity;
+import com.ltkj.tduck.request.CheckWritePwdRequest;
+import com.ltkj.tduck.service.UserFormSettingService;
+import com.ltkj.tduck.utils.CacheUtils;
+import com.ltkj.tduck.utils.Result;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.security.PermitAll;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * 琛ㄥ崟璁剧疆
+ *
+ * @author : smalljop
+ * @description : 琛ㄥ崟璁剧疆
+ * @create : 2020-11-18 18:17
+ **/
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+public class UserFormSettingController {
+
+ private final UserFormSettingService userFormSettingService;
+// private final WxMpUserService wxMpUserService;
+ private final CacheUtils cacheUtils;
+// private final WxMpService wxMpService;
+
+
+ /**
+ * 淇濆瓨琛ㄥ崟璁剧疆
+ */
+ @PostMapping("/user/form/setting/save")
+ public Result<Boolean> saveFormSetting(@RequestBody Map<String, Object> setting) {
+ String formKey = setting.get("formKey").toString();
+// FormAuthUtils.hasPermission(formKey);
+ return Result.success(userFormSettingService.saveFormSetting(setting));
+ }
+
+ /**
+ * 琛ㄥ崟鎻愪氦璁剧疆鏌ヨ
+ */
+ @GetMapping("/user/form/setting/{key}")
+ public Result<Map<String, Object>> queryFormSettingByKey(@PathVariable("key") String formKey) {
+ UserFormSettingEntity setting = userFormSettingService.getFormSettingByKey(formKey);
+ if (ObjectUtil.isNull(setting)) {
+ return Result.success();
+ }
+ Map<String, Object> settings = setting.getSettings();
+ settings.put(UserFormSettingEntity.Fields.formKey, formKey);
+ return Result.success(settings);
+ }
+
+
+ /**
+ * 褰撳墠濉啓璁剧疆鐨勭姸鎬�
+ *
+ * @param formKey 琛ㄥ崟key
+ * @param wxOpenId 寰俊openid
+ * @param type 绫诲瀷 1鍏紑濉啓 2.鎸囧畾濉啓
+ */
+ @GetMapping("/user/form/setting-status")
+ @PermitAll
+ public Result<Boolean> querySettingStatus(@RequestParam String formKey, @RequestParam(required = false) String wxOpenId, @RequestParam(required = false) Integer type, HttpServletRequest request) {
+ return userFormSettingService.getUserFormWriteSettingStatus(formKey, HttpUtils.getIpAddr(request), wxOpenId, type);
+ }
+
+
+ /**
+ * 濉啓寰俊閫氱煡浜岀淮鐮�
+ */
+ @GetMapping("/user/form/wx/notify-qrcode")
+ public Result<String> getWxNotifyQrCode(@RequestParam("key") String formKey) throws Exception {
+// String loginSceneStr = JsonUtils.objToJson(new WxMpQrCodeGenRequest(WxMpQrCodeGenRequest.QrCodeType.SUB_NOTIFY, formKey));
+// //5鍒嗛挓鏈夋晥
+// WxMpQrCodeTicket ticket = wxMpService.getQrcodeService().qrCodeCreateTmpTicket(loginSceneStr, 10 * 60);
+// String subNotifyQrcodeUrl = wxMpService.getQrcodeService().qrCodePictureUrl(ticket.getTicket());
+// return Result.success(subNotifyQrcodeUrl);
+ return Result.success();
+ }
+
+
+ /**
+ * 濉啓寰俊閫氱煡浜岀淮鐮�
+ */
+ @PostMapping("/user/form/wx/delete/notify-user")
+ public Result<Boolean> deleteWxNotifyQrCode(@RequestParam("key") String key, @RequestParam("openId") String openId) {
+// cacheUtils.removeList(StrUtil.format(WxMpRedisKeyConstants.WX_MP_SUB_NOTIFY, key), openId);
+ return Result.success(true);
+ }
+
+ /**
+ * 鑾峰彇琛ㄥ崟寰俊閫氱煡鐢ㄦ埛
+ */
+ @GetMapping("/user/form/wx/notify-user")
+ public Result getWxNotifyUser(@RequestParam("key") String formKey, @RequestParam(required = false) String openIdStr) {
+// Set<Object> subNotifyUsers = null;
+// if (StrUtil.isNotBlank(openIdStr)) {
+// subNotifyUsers = Sets.newHashSet(StrUtil.splitTrim(openIdStr, ";"));
+// } else {
+// List coll = cacheUtils.getList(StrUtil.format(WxMpRedisKeyConstants.WX_MP_SUB_NOTIFY, formKey), String.class);
+// subNotifyUsers = Collections.singleton(coll.stream().collect(Collectors.toSet()));
// }
-// Map<String, Object> settings = setting.getSettings();
-// settings.put(UserFormSettingEntity.Fields.formKey, formKey);
-// return Result.success(settings);
-// }
-//
-//
-// /**
-// * 褰撳墠濉啓璁剧疆鐨勭姸鎬�
-// *
-// * @param formKey 琛ㄥ崟key
-// * @param wxOpenId 寰俊openid
-// * @param type 绫诲瀷 1鍏紑濉啓 2.鎸囧畾濉啓
-// */
-// @GetMapping("/user/form/setting-status")
-// @PermitAll
-// public Result<Boolean> querySettingStatus(@RequestParam String formKey, @RequestParam(required = false) String wxOpenId, @RequestParam(required = false) Integer type, HttpServletRequest request) {
-// return userFormSettingService.getUserFormWriteSettingStatus(formKey, HttpUtils.getIpAddr(request), wxOpenId, type);
-// }
-//
-//
-// /**
-// * 濉啓寰俊閫氱煡浜岀淮鐮�
-// */
-// @GetMapping("/user/form/wx/notify-qrcode")
-// public Result<String> getWxNotifyQrCode(@RequestParam("key") String formKey) throws Exception {
-//// String loginSceneStr = JsonUtils.objToJson(new WxMpQrCodeGenRequest(WxMpQrCodeGenRequest.QrCodeType.SUB_NOTIFY, formKey));
-//// //5鍒嗛挓鏈夋晥
-//// WxMpQrCodeTicket ticket = wxMpService.getQrcodeService().qrCodeCreateTmpTicket(loginSceneStr, 10 * 60);
-//// String subNotifyQrcodeUrl = wxMpService.getQrcodeService().qrCodePictureUrl(ticket.getTicket());
-//// return Result.success(subNotifyQrcodeUrl);
-// return Result.success();
-// }
-//
-//
-// /**
-// * 濉啓寰俊閫氱煡浜岀淮鐮�
-// */
-// @PostMapping("/user/form/wx/delete/notify-user")
-// public Result<Boolean> deleteWxNotifyQrCode(@RequestParam("key") String key, @RequestParam("openId") String openId) {
-//// cacheUtils.removeList(StrUtil.format(WxMpRedisKeyConstants.WX_MP_SUB_NOTIFY, key), openId);
-// return Result.success(true);
-// }
-//
-// /**
-// * 鑾峰彇琛ㄥ崟寰俊閫氱煡鐢ㄦ埛
-// */
-// @GetMapping("/user/form/wx/notify-user")
-// public Result getWxNotifyUser(@RequestParam("key") String formKey, @RequestParam(required = false) String openIdStr) {
-//// Set<Object> subNotifyUsers = null;
-//// if (StrUtil.isNotBlank(openIdStr)) {
-//// subNotifyUsers = Sets.newHashSet(StrUtil.splitTrim(openIdStr, ";"));
-//// } else {
-//// List coll = cacheUtils.getList(StrUtil.format(WxMpRedisKeyConstants.WX_MP_SUB_NOTIFY, formKey), String.class);
-//// subNotifyUsers = Collections.singleton(coll.stream().collect(Collectors.toSet()));
-//// }
-//// return Result.success(wxMpUserService.listWxMpUserByOpenId(subNotifyUsers).stream().map(item -> new WxMpUserVO(item.getNickname(), item.getHeadImgUrl(), item.getOpenId())).collect(Collectors.toList()));
-// return Result.success();
-// }
-//
-//
-// /**
-// * 鍏紑鎺ュ彛
-// * 琛ㄥ崟濉啓鏃堕渶瑕佺殑璁剧疆
-// */
-// @GetMapping("/user/form/public/settings/{key}")
-// @PermitAll
-// public Result queryPublicFormSettingByKey(@PathVariable("key") String formKey) {
-//// FormSettingSchemaStruct formSettingSchema = userFormSettingService.getFormSettingSchema(formKey);
-// return Result.success();
-// }
-//
-// /**
-// * 鍏紑鎺ュ彛
-// * 妫�鏌ュ～鍐欏瘑鐮佹槸鍚︽纭�
-// */
-// @PostMapping("/user/form/public/checkWritePwd")
-// @PermitAll
-// public Result<Boolean> checkWritePwd(@RequestBody @Validated CheckWritePwdRequest request) {
-//// FormSettingSchemaStruct formSettingSchema = userFormSettingService.getFormSettingSchema(request.getFormKey());
-//// if (formSettingSchema.getWritePassword().equals(request.getPassword())) {
-//// return Result.success(true);
-//// }
-//// return Result.failed("瀵嗙爜杈撳叆閿欒");
-// return Result.success(true);
-// }
-//
-//
-//}
+// return Result.success(wxMpUserService.listWxMpUserByOpenId(subNotifyUsers).stream().map(item -> new WxMpUserVO(item.getNickname(), item.getHeadImgUrl(), item.getOpenId())).collect(Collectors.toList()));
+ return Result.success();
+ }
+
+
+ /**
+ * 鍏紑鎺ュ彛
+ * 琛ㄥ崟濉啓鏃堕渶瑕佺殑璁剧疆
+ */
+ @GetMapping("/user/form/public/settings/{key}")
+ @PermitAll
+ public Result queryPublicFormSettingByKey(@PathVariable("key") String formKey) {
+// FormSettingSchemaStruct formSettingSchema = userFormSettingService.getFormSettingSchema(formKey);
+ return Result.success();
+ }
+
+ /**
+ * 鍏紑鎺ュ彛
+ * 妫�鏌ュ～鍐欏瘑鐮佹槸鍚︽纭�
+ */
+ @PostMapping("/user/form/public/checkWritePwd")
+ @PermitAll
+ public Result<Boolean> checkWritePwd(@RequestBody @Validated CheckWritePwdRequest request) {
+// FormSettingSchemaStruct formSettingSchema = userFormSettingService.getFormSettingSchema(request.getFormKey());
+// if (formSettingSchema.getWritePassword().equals(request.getPassword())) {
+// return Result.success(true);
+// }
+// return Result.failed("瀵嗙爜杈撳叆閿欒");
+ return Result.success(true);
+ }
+
+
+}
--
Gitblit v1.8.0