diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserWxAqrCode.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserWxAqrCode.java index b1ebc826..50256563 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserWxAqrCode.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserWxAqrCode.java @@ -1,4 +1,5 @@ package com.ruoyi.system.domain; + import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -45,10 +46,6 @@ public class UserWxAqrCode extends BaseEntity @Excel(name = "参数") private String scene; - /** 微信二维码的base64编码 */ - @Excel(name = "微信二维码的base64编码") - private String base64; - /** 二维码地址 */ @Excel(name = "二维码地址") private String codeImgUrl; @@ -69,6 +66,10 @@ public class UserWxAqrCode extends BaseEntity @Excel(name = "宽度") private Integer width; + /** 用途说明 */ + @Excel(name = "用途说明") + private String useDesc; + public void setId(Long id) { this.id = id; @@ -132,15 +133,6 @@ public class UserWxAqrCode extends BaseEntity { return scene; } - public void setBase64(String base64) - { - this.base64 = base64; - } - - public String getBase64() - { - return base64; - } public void setCodeImgUrl(String codeImgUrl) { this.codeImgUrl = codeImgUrl; @@ -186,6 +178,15 @@ public class UserWxAqrCode extends BaseEntity { return width; } + public void setUseDesc(String useDesc) + { + this.useDesc = useDesc; + } + + public String getUseDesc() + { + return useDesc; + } @Override public String toString() { @@ -197,12 +198,12 @@ public class UserWxAqrCode extends BaseEntity .append("modifiedBy", getModifiedBy()) .append("lastUpdatedTime", getLastUpdatedTime()) .append("scene", getScene()) - .append("base64", getBase64()) .append("codeImgUrl", getCodeImgUrl()) .append("userId", getUserId()) .append("busType", getBusType()) .append("page", getPage()) .append("width", getWidth()) + .append("useDesc", getUseDesc()) .toString(); } } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWxAqrCodeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWxAqrCodeServiceImpl.java index 741512f1..5f8d5c1a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWxAqrCodeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWxAqrCodeServiceImpl.java @@ -110,12 +110,10 @@ public class UserWxAqrCodeServiceImpl implements IUserWxAqrCodeService System.out.println("id = "+userWxAqrCode.getId()+" accessToken = "+ accessToken); WxAppletsCodeVo wxAppletsCodeVo = new WxAppletsCodeVo(); wxAppletsCodeVo.setScene(String.valueOf(userWxAqrCode.getId())); - wxAppletsCodeVo.setPage("pages/index2/index2"); + wxAppletsCodeVo.setPage(userWxAqrCode.getPage()); wxAppletsCodeVo = wxAppletsFeign.getWxacodeunlimit(wxAppletsCodeVo,accessToken); //更新二维码表 userWxAqrCode.setCodeImgUrl(wxAppletsCodeVo.getCodeImgUrl()); - userWxAqrCode.setBase64(wxAppletsCodeVo.getBase64()); - userWxAqrCode.setPage(wxAppletsCodeVo.getPage()); userWxAqrCode.setScene(wxAppletsCodeVo.getScene()); userWxAqrCode.setWidth(wxAppletsCodeVo.getWidth()); userWxAqrCodeMapper.updateUserWxAqrCode(userWxAqrCode); diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserWxAqrCodeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserWxAqrCodeMapper.xml index d5b1b332..d3f09268 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserWxAqrCodeMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserWxAqrCodeMapper.xml @@ -12,16 +12,16 @@ - + - select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, scene, base64, code_img_url, user_id, bus_type, page, width from user_wx_aqr_code + select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, scene, code_img_url, user_id, bus_type, page, width, use_desc from user_wx_aqr_code @@ -56,12 +56,12 @@ MODIFIED_BY, LAST_UPDATED_TIME, scene, - base64, code_img_url, user_id, bus_type, page, width, + use_desc, #{isDeleted}, @@ -70,12 +70,12 @@ #{modifiedBy}, #{lastUpdatedTime}, #{scene}, - #{base64}, #{codeImgUrl}, #{userId}, #{busType}, #{page}, #{width}, + #{useDesc}, @@ -88,12 +88,12 @@ MODIFIED_BY = #{modifiedBy}, LAST_UPDATED_TIME = #{lastUpdatedTime}, scene = #{scene}, - base64 = #{base64}, code_img_url = #{codeImgUrl}, user_id = #{userId}, bus_type = #{busType}, page = #{page}, width = #{width}, + use_desc = #{useDesc}, where ID = #{id} diff --git a/ruoyi-ui/src/views/system/code/index.vue b/ruoyi-ui/src/views/system/code/index.vue index 395086bc..4a912bd8 100644 --- a/ruoyi-ui/src/views/system/code/index.vue +++ b/ruoyi-ui/src/views/system/code/index.vue @@ -1,14 +1,6 @@