diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxBannerImageController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxBannerImageController.java index cee1effc7..f5eef94b1 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxBannerImageController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxBannerImageController.java @@ -1,6 +1,9 @@ package com.stdiet.custom.controller; +import java.util.ArrayList; import java.util.List; + +import com.stdiet.common.utils.oss.AliyunOSSUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -42,6 +45,17 @@ public class SysWxBannerImageController extends BaseController { startPage(); List list = sysWxBannerImageService.selectSysWxBannerImageList(sysWxBannerImage); + if(list != null && list.size() > 0){ + List urlList = new ArrayList<>(); + for (SysWxBannerImage banner : list) { + urlList.add(banner.getBannerUrl()); + } + List previewBannerUrlList = AliyunOSSUtils.generatePresignedUrl(urlList); + int index = 0; + for (SysWxBannerImage banner : list) { + banner.setPreviewBannerUrl(previewBannerUrlList.get(index++)); + } + } return getDataTable(list); } @@ -65,7 +79,11 @@ public class SysWxBannerImageController extends BaseController @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { - return AjaxResult.success(sysWxBannerImageService.selectSysWxBannerImageById(id)); + SysWxBannerImage sysWxBannerImage = sysWxBannerImageService.selectSysWxBannerImageById(id); + if(sysWxBannerImage != null){ + sysWxBannerImage.setPreviewBannerUrl(AliyunOSSUtils.generatePresignedUrl(sysWxBannerImage.getBannerUrl())); + } + return AjaxResult.success(sysWxBannerImage); } /** diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java index 736ed3450..d2b99289c 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java @@ -787,9 +787,16 @@ public class WechatAppletController extends BaseController { public TableDataInfo getCommunityPunch() { startPage(); List list = sysWxUserLogService.getCommunityPunch(new SysWxUserLog()); + if(list != null && list.size() > 0){ + for (CommunityPunchReponse comm : list) { + comm.setId(AesUtils.encrypt(comm.getId())); + comm.setCusId(AesUtils.encrypt(comm.getCusId())); + } + } return getDataTable(list); } + /** * 修改健康减脂宣言 * @return diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxBannerImage.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxBannerImage.java index 2cbbf7a2b..2bdc01721 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxBannerImage.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxBannerImage.java @@ -44,4 +44,7 @@ public class SysWxBannerImage extends BaseEntity /** 删除标识 0未删除 1已删除 */ private Long delFlag; + + //预览Banner图片地址 + private String previewBannerUrl; } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/CommunityPunchReponse.java b/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/CommunityPunchReponse.java index 8eec9b950..278771dc3 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/CommunityPunchReponse.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/CommunityPunchReponse.java @@ -14,6 +14,9 @@ import java.util.Map; @Data public class CommunityPunchReponse { + //加密ID + private String id; + /** * 微信openid */ @@ -22,7 +25,7 @@ public class CommunityPunchReponse { /** * 客户ID */ - private Long cusId; + private String cusId; /** * 昵称 diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxBannerImageMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxBannerImageMapper.xml index b70a7d2b5..ab6f886b1 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysWxBannerImageMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxBannerImageMapper.xml @@ -25,6 +25,12 @@ - select wxinfo.openid,wxinfo.cus_id,wxinfo.nick_name,wxinfo.avatar_url,wxlog.log_time,wxlog.weight,wxlog.comment,wxlog.thumbsup_num,wxlog.health_manifesto from sys_wx_user_log wxlog + select wxlog.id,wxinfo.openid,wxinfo.cus_id,wxinfo.nick_name,wxinfo.avatar_url,wxlog.log_time,wxlog.weight,wxlog.comment,wxlog.thumbsup_num,wxlog.health_manifesto from sys_wx_user_log wxlog left join sys_wx_user_info wxinfo on wxinfo.openid = wxlog.openid where wxlog.del_flag = 0 order by wxlog.log_time desc diff --git a/stdiet-ui/src/api/custom/wxBannerImage.js b/stdiet-ui/src/api/custom/wxBannerImage.js new file mode 100644 index 000000000..449686571 --- /dev/null +++ b/stdiet-ui/src/api/custom/wxBannerImage.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询小程序banner图列表 +export function listWxBannerImage(query) { + return request({ + url: '/custom/wxBannerImage/list', + method: 'get', + params: query + }) +} + +// 查询小程序banner图详细 +export function getWxBannerImage(id) { + return request({ + url: '/custom/wxBannerImage/' + id, + method: 'get' + }) +} + +// 新增小程序banner图 +export function addWxBannerImage(data) { + return request({ + url: '/custom/wxBannerImage', + method: 'post', + data: data + }) +} + +// 修改小程序banner图 +export function updateWxBannerImage(data) { + return request({ + url: '/custom/wxBannerImage', + method: 'put', + data: data + }) +} + +// 删除小程序banner图 +export function delWxBannerImage(id) { + return request({ + url: '/custom/wxBannerImage/' + id, + method: 'delete' + }) +} + +// 导出小程序banner图 +export function exportWxBannerImage(query) { + return request({ + url: '/custom/wxBannerImage/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/stdiet-ui/src/components/FileUpload/UploadFile.vue b/stdiet-ui/src/components/FileUpload/UploadFile.vue index 62b4e31b7..38ffd2447 100644 --- a/stdiet-ui/src/components/FileUpload/UploadFile.vue +++ b/stdiet-ui/src/components/FileUpload/UploadFile.vue @@ -7,7 +7,7 @@ :on-success="handleFileSuccess" :accept="'.png,.jpg'" :before-upload="beforeAvatarUpload"> - +
@@ -61,7 +61,7 @@ export default { }, removeFile(){ this.resetUpload(); - this.coverUrl = null; + //this.coverUrl = null; this.$emit("callbackMethod", ''); }, // 文件上传失败处理 @@ -92,6 +92,10 @@ export default { tips: { type: String, default: "" + }, + width: { + type: Number, + default: undefined } } }; diff --git a/stdiet-ui/src/views/custom/wxBannerImage/index.vue b/stdiet-ui/src/views/custom/wxBannerImage/index.vue new file mode 100644 index 000000000..345e07d7f --- /dev/null +++ b/stdiet-ui/src/views/custom/wxBannerImage/index.vue @@ -0,0 +1,363 @@ + + + \ No newline at end of file