feats

src/main/java/com/njyunzhi/pet_identity/controller/TaMiniappQrcodeController.java

@@ -39,80 +39,80 @@ public class TaMiniappQrcodeController extends BaseController {
     @Autowired
     public ITaMiniappQrcodeService iTaMiniappQrcodeService;
 
-
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/taMiniappQrcode",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taMiniappQrcodeList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
-		    IPage<TaMiniappQrcode> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaMiniappQrcode> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaMiniappQrcode> result = iTaMiniappQrcodeService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
-    }
-
-    /**
-     * 保存对象
-     * @param taMiniappQrcode 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taMiniappQrcode",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taMiniappQrcodeAdd(@ApiParam("保存内容") @RequestBody TaMiniappQrcode taMiniappQrcode) throws Exception{
-
-        if (iTaMiniappQrcodeService.save(taMiniappQrcode)){
-            return ResponseBean.success(taMiniappQrcode);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taMiniappQrcode/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taMiniappQrcodeDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaMiniappQrcodeService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taMiniappQrcode 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taMiniappQrcode/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taMiniappQrcodeUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaMiniappQrcode taMiniappQrcode) throws Exception{
-
-        if (iTaMiniappQrcodeService.updateById(taMiniappQrcode)){
-            return ResponseBean.success(iTaMiniappQrcodeService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
+//
+//    /**
+//     * 分页查询列表
+//     * @param pageNum
+//     * @param pageSize
+//     * @return
+//     */
+//    @RequestMapping(value="/taMiniappQrcode",method= RequestMethod.GET)
+//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taMiniappQrcodeList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+//
+//		    IPage<TaMiniappQrcode> pg = new Page<>(pageNum, pageSize);
+//            QueryWrapper<TaMiniappQrcode> queryWrapper = new QueryWrapper<>();
+//            queryWrapper.orderByDesc("create_date");
+//
+//            IPage<TaMiniappQrcode> result = iTaMiniappQrcodeService.page(pg, queryWrapper);
+//            return ResponseBean.success(result);
+//    }
+//
+//    /**
+//     * 保存对象
+//     * @param taMiniappQrcode 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taMiniappQrcode",method= RequestMethod.POST)
+//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+//    public ResponseBean taMiniappQrcodeAdd(@ApiParam("保存内容") @RequestBody TaMiniappQrcode taMiniappQrcode) throws Exception{
+//
+//        if (iTaMiniappQrcodeService.save(taMiniappQrcode)){
+//            return ResponseBean.success(taMiniappQrcode);
+//        }else {
+//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id删除对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taMiniappQrcode/{id}", method= RequestMethod.DELETE)
+//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+//    public ResponseBean taMiniappQrcodeDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        if(iTaMiniappQrcodeService.removeById(id)){
+//            return ResponseBean.success("success");
+//        }else {
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 修改对象
+//     * @param id  实体ID
+//     * @param taMiniappQrcode 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taMiniappQrcode/{id}",method= RequestMethod.PUT)
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+//    public ResponseBean taMiniappQrcodeUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+//                                        @ApiParam("更新内容") @RequestBody TaMiniappQrcode taMiniappQrcode) throws Exception{
+//
+//        if (iTaMiniappQrcodeService.updateById(taMiniappQrcode)){
+//            return ResponseBean.success(iTaMiniappQrcodeService.getById(id));
+//        }else {
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
 
     /**
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taMiniappQrcode/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    @RequestMapping(value="/wx/{clientId}/qrcode/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="查询二维码详情", notes = "查询二维码详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taMiniappQrcodeGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
         return ResponseBean.success(iTaMiniappQrcodeService.getById(id));
     }

src/main/java/com/njyunzhi/pet_identity/entity/TaMiniappQrcode.java

@@ -27,7 +27,7 @@ public class TaMiniappQrcode implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "小程序码ID")
-    @TableId(value = "qr_id", type = IdType.AUTO)
+    @TableId(value = "qr_id", type = IdType.INPUT)
     private Integer qrId;
 
     @ApiModelProperty(value = "小程序ID")

src/main/java/com/njyunzhi/pet_identity/service/ITaMiniappQrcodeService.java

@@ -2,6 +2,7 @@ package com.njyunzhi.pet_identity.service;
 
 import com.njyunzhi.pet_identity.entity.TaMiniappQrcode;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njyunzhi.pet_identity.vo.MiniAppScene;
 
 /**
  * <p>
@@ -13,5 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaMiniappQrcodeService extends IService<TaMiniappQrcode> {
 
-    TaMiniappQrcode createQRCode(String page, String scene) throws Exception;
+    TaMiniappQrcode createQRCode(MiniAppScene scene) throws Exception;
 }

src/main/java/com/njyunzhi/pet_identity/service/impl/TaCardNoServiceImpl.java

@@ -11,6 +11,7 @@ import com.njyunzhi.pet_identity.service.ITaCardNoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njyunzhi.pet_identity.service.ITaMiniappQrcodeService;
 import com.njyunzhi.pet_identity.vo.BatchCardParams;
+import com.njyunzhi.pet_identity.vo.MiniAppScene;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
@@ -35,8 +36,8 @@ public class TaCardNoServiceImpl extends ServiceImpl<TaCardNoMapper, TaCardNo> i
     @Autowired
     ITaMiniappQrcodeService iTaMiniappQrcodeService;
 
-    @Value("${yz.miniapp.qrpath}")
-    String qrpath;
+    @Value("${yz.miniapp.cardpath}")
+    String cardpath;
 
     @Override
     public TaCardNo getUnuseCard(String cardNo) {
@@ -62,11 +63,10 @@ public class TaCardNoServiceImpl extends ServiceImpl<TaCardNoMapper, TaCardNo> i
         for (int i = 0; i < batchCardParams.getNum(); i += 1) {
             Integer nextVal = taSequenceMapper.getNextVal("card-" + batchCardParams.getPrefix());
             String cardNo = batchCardParams.getPrefix() + StringUtils.lpad(nextVal.toString(), "0", 4);
-            String scene = StringUtils.urlEncode(String.format("page=%s&cardno=%s", "cardinfo", cardNo));
+            MiniAppScene scene = new MiniAppScene().setPage(cardpath).setQueryStr("cardno=" + StringUtils.urlEncode(cardNo));
 
             // 生成小程序码
-            qrpath = StringUtils.trim(qrpath, "/"); // 去掉开头的 /
-            TaMiniappQrcode qrCode = iTaMiniappQrcodeService.createQRCode(qrpath, scene);
+            TaMiniappQrcode qrCode = iTaMiniappQrcodeService.createQRCode(scene);
             // 生成模板图片
             // TODO
 

src/main/java/com/njyunzhi/pet_identity/service/impl/TaMiniappQrcodeServiceImpl.java

@@ -2,14 +2,17 @@ package com.njyunzhi.pet_identity.service.impl;
 
 import cn.binarywang.wx.miniapp.api.WxMaQrcodeService;
 import cn.binarywang.wx.miniapp.bean.WxMaCodeLineColor;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.njyunzhi.pet_identity.common.OSSUtils;
 import com.njyunzhi.pet_identity.common.StringUtils;
 import com.njyunzhi.pet_identity.common.WxUtils;
 import com.njyunzhi.pet_identity.entity.TaMiniappQrcode;
 import com.njyunzhi.pet_identity.mapper.TaMiniappQrcodeMapper;
+import com.njyunzhi.pet_identity.mapper.TaSequenceMapper;
 import com.njyunzhi.pet_identity.service.ITaMiniappQrcodeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njyunzhi.pet_identity.vo.MiniAppScene;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -39,20 +42,32 @@ public class TaMiniappQrcodeServiceImpl extends ServiceImpl<TaMiniappQrcodeMappe
     @Value("${weixin.miniapp.appid}")
     String miniAppid;
 
+    @Value("${yz.miniapp.qrpath}")
+    String qrpath;
+
     @Value("${yz.miniapp.qrEnv}")
     String envVersion;
 
+    @Autowired
+    TaSequenceMapper taSequenceMapper;
+
     @Override
-    public TaMiniappQrcode createQRCode(String page, String scene) throws Exception {
-        TaMiniappQrcode taMiniappQrcode = getByPageAndScene(page, scene);
+    public TaMiniappQrcode createQRCode(MiniAppScene scene) throws Exception {
+        String sceneStr = JSON.toJSONString(scene);
+        TaMiniappQrcode taMiniappQrcode = getByScene(sceneStr);
         if (null != taMiniappQrcode) return taMiniappQrcode;
 
-        // 调用SDK
-        String qrImage = buildMAQrCode(page, scene);
+        // 从 nextval 是从 0 开始, qrcodeId 必须从 +1 开始
+        Integer qrCodeID = taSequenceMapper.getNextVal("qrcode") + 1;
+
+        // 调用SDK, 生成小程序码, 小程序码的 scene 实际上是 TaMiniappQrcode 的主键
+        String qrImage = buildMAQrCode(qrCodeID.toString());
+        //
         taMiniappQrcode = new TaMiniappQrcode();
+        taMiniappQrcode.setQrId(qrCodeID);
         taMiniappQrcode.setMiniappId(miniAppid);
-        taMiniappQrcode.setPage(page);
-        taMiniappQrcode.setScene(scene);
+        taMiniappQrcode.setPage(qrpath);
+        taMiniappQrcode.setScene(sceneStr);
         taMiniappQrcode.setQrImage(qrImage);
 
         if (!save(taMiniappQrcode)) {
@@ -62,11 +77,11 @@ public class TaMiniappQrcodeServiceImpl extends ServiceImpl<TaMiniappQrcodeMappe
         return taMiniappQrcode;
     }
 
-    public TaMiniappQrcode getByPageAndScene(String page, String scene) {
+    public TaMiniappQrcode getByScene(String sceneStr) {
         LambdaQueryWrapper<TaMiniappQrcode> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(TaMiniappQrcode::getMiniappId, miniAppid)
-                .eq(TaMiniappQrcode::getPage, page)
-                .eq(!StringUtils.isEmpty(scene), TaMiniappQrcode::getScene, scene)
+                .eq(TaMiniappQrcode::getPage, qrpath)
+                .eq(TaMiniappQrcode::getScene, sceneStr)
                 .orderByDesc(TaMiniappQrcode::getCreateDate)
                 .last("limit 1");
 
@@ -75,15 +90,14 @@ public class TaMiniappQrcodeServiceImpl extends ServiceImpl<TaMiniappQrcodeMappe
 
     /**
      * 生成小程序码, 并上传阿里云
-     * @param page
      * @param scene
      * @return
      * @throws WxErrorException
      */
-    private String buildMAQrCode(String page, String scene) throws WxErrorException, FileNotFoundException {
+    private String buildMAQrCode(String scene) throws WxErrorException, FileNotFoundException {
         WxMaQrcodeService qrcodeService = wxUtils.getMaService().getQrcodeService();
         File qrFile = qrcodeService.createWxaCodeUnlimit(scene,
-                page,
+                qrpath,
                 false, // checkPath
                 envVersion,
                 430, // width

src/main/java/com/njyunzhi/pet_identity/vo/MiniAppScene.java

@@ -0,0 +1,19 @@
+package com.njyunzhi.pet_identity.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@ApiModel(description = "小程序二维码参数")
+@Data
+@Accessors(chain = true)
+public class MiniAppScene {
+
+    @ApiModelProperty(value = "页面地址",notes = "")
+    String page;
+
+    @ApiModelProperty(value = "页面参数",notes = "")
+    String queryStr;
+}

src/main/resources/application.yml

@@ -43,7 +43,9 @@ yz:
   default:
     servBase: https://pet-certificate-online.njyunzhi.com/api
   miniapp:
+    # 以下小程序页面地址, 不能以 / 开头
     qrpath: pages/qrcode/index
+    cardpath: pages/dogCardDetail/index
     qrEnv: develop
   sms:
     ## ??????