* 新需求

src/main/java/com/huiju/estateagents/bo/request/QrCodeStatisticResponseBO.java

@@ -0,0 +1,29 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 二维码统计返回实体
+ *
+ * @author gusy
+ * @date 2020/5/21 13:53
+ */
+@Data
+public class QrCodeStatisticResponseBO {
+
+    /**
+     * 访问人数
+     */
+    private Integer visitPersons;
+
+    /**
+     * 访问次数
+     */
+    private Integer visitNum;
+
+    /**
+     * 新增用户
+     */
+    private Integer newPersons;
+
+}

src/main/java/com/huiju/estateagents/common/MiniAppPageEnum.java

@@ -0,0 +1,90 @@
+package com.huiju.estateagents.common;
+
+/**
+ * 小程序页面枚举
+ *
+ * @author gusy
+ * @date 2020/5/21 15:58
+ */
+public enum MiniAppPageEnum {
+
+    /**
+     * 项目
+     */
+    PROJECT("project", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/project/detail/index"),
+
+    /**
+     * 报名活动
+     */
+    ACTIVITY("activity", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/activity/detail/index"),
+
+    /**
+     * 助力活动
+     */
+    HELP("help", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/activity/detail/assistance"),
+
+    /**
+     * 拼团活动
+     */
+    GROUP("group", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/activity/detail/assemble"),
+
+    /**
+     * h5活动
+     */
+    H5("h5", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/project/h5Page"),
+
+    /**
+     * 直播活动
+     */
+    LIVE("live", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "onlineSelling/pages/live/index"),
+
+    /**
+     * 资讯
+     */
+    NEWS("news", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/news/detail/index"),
+
+    /**
+     * 在线选房
+     */
+    SALESBATCH("salesBatch", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "onlineSelling/pages/houseList/index");
+
+    private String type;
+    private String scene;
+    private String page;
+
+    MiniAppPageEnum(String type, String scene, String page) {
+        this.type = type;
+        this.scene = scene;
+        this.page = page;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public String getScene() {
+        return scene;
+    }
+
+    public String getPage() {
+        return page;
+    }
+
+    public static String getSceneByType(String type) {
+        for (MiniAppPageEnum pageEnum : MiniAppPageEnum.values()) {
+            if (type.equals(pageEnum.getType())) {
+                return pageEnum.getScene();
+            }
+        }
+        return null;
+    }
+
+    public static String getPageByType(String type) {
+        for (MiniAppPageEnum pageEnum : MiniAppPageEnum.values()) {
+            if (type.equals(pageEnum.getType())) {
+                return pageEnum.getPage();
+            }
+        }
+        return null;
+    }
+}

src/main/java/com/huiju/estateagents/common/WxQrCodeUtils.java

@@ -0,0 +1,33 @@
+package com.huiju.estateagents.common;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 微信二维码生成工具类
+ *
+ * @author gusy
+ * @date 2020/5/21 15:40
+ */
+public class WxQrCodeUtils {
+
+    /**
+     * 生成scene和页面
+     *
+     * @param type
+     * @param scene  为空则使用配置的通用模板
+     * @param params scene为空是必须按照模板内容填写
+     * @return
+     */
+    public static String generateSceneAndPage(String type, String scene, String... params) {
+        if (StringUtils.isBlank(scene)) {
+            String sceneTemplate = MiniAppPageEnum.getSceneByType(type);
+            scene = String.format(sceneTemplate, params);
+        }
+
+        JSONObject obj = new JSONObject();
+        obj.put("scene", scene);
+        obj.put("page", MiniAppPageEnum.getPageByType(type));
+        return obj.toJSONString();
+    }
+}

src/main/java/com/huiju/estateagents/controller/TaQrcodeController.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +8,10 @@ import com.google.gson.JsonObject;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.WxQrCodeUtils;
+import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaQrcode;
+import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaQrcodeService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -36,6 +40,9 @@ public class TaQrcodeController extends BaseController {
     @Autowired
     public ITaQrcodeService iTaQrcodeService;
 
+    @Autowired
+    private IMiniAppService iMiniAppService;
+
 
     /**
      * 分页查询列表
@@ -45,7 +52,7 @@ public class TaQrcodeController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/listQrCode", method = RequestMethod.GET)
-    public ResponseBean taQrcodeList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+    public ResponseBean listQrCodeByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                      String targetType, String targetName, Integer channelId, String buildingId,
                                      HttpServletRequest request) {
@@ -53,18 +60,7 @@ public class TaQrcodeController extends BaseController {
                 targetType, targetName, channelId, buildingId);
         ResponseBean responseBean = new ResponseBean();
         try {
-            //使用分页插件
-            IPage<TaQrcode> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaQrcode> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq(StringUtils.isNotBlank(targetType), "target_type", targetType);
-            queryWrapper.eq(StringUtils.isNotBlank(targetName), "target_name", targetName);
-            queryWrapper.eq(channelId != null, "channel_id", channelId);
-            queryWrapper.eq(StringUtils.isNotBlank(buildingId), "buildingId", buildingId);
-            queryWrapper.eq("org_id", getOrgId(request));
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaQrcode> result = iTaQrcodeService.page(pg, queryWrapper);
-            responseBean.addSuccess(result);
+            responseBean = iTaQrcodeService.listQrCodeByCondition(pageNum,pageSize,targetType,targetName,channelId,buildingId,getOrgId(request));
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taQrcodeList -=- {}", e.toString());
@@ -80,22 +76,13 @@ public class TaQrcodeController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/taQrcode", method = RequestMethod.POST)
-    public ResponseBean taQrcodeAdd(@RequestBody TaQrcode taQrcode, HttpServletRequest request) {
+    public ResponseBean saveQrcode(@RequestBody TaQrcode taQrcode, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            taQrcode.setOrgId(getOrgId(request));
-            taQrcode.setCreateUser(getUserId(request));
-            taQrcode.setCreateDate(LocalDateTime.now());
-            taQrcode.setStatus(CommConstant.STATUS_NORMAL);
-
-            if (iTaQrcodeService.save(taQrcode)) {
-                responseBean.addSuccess(taQrcode);
-            } else {
-                responseBean.addError("fail");
-            }
+            responseBean = iTaQrcodeService.saveQrcode(taQrcode, getUserId(request), getOrgId(request));
         } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taQrcodeAdd -=- {}", e.toString());
+            logger.error("saveQrcode -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -190,4 +177,24 @@ public class TaQrcodeController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 获取二维码统计信息
+     *
+     * @param request
+     * @return
+     */
+    @RequestMapping("/admin/qrCode/getStatisticData")
+    public ResponseBean getStatisticData(Integer qrCodeId, HttpServletRequest request) {
+        logger.info("getStatisticData 接收参数：qrCodeId：{}", qrCodeId);
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaQrcodeService.getStatisticData(qrCodeId, getOrgId(request));
+            logger.info("getStatisticData 返回结果：{}", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("getStatisticData 异常：", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/controller/TaRaiseController.java

@@ -7,23 +7,20 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRaise;
-import com.huiju.estateagents.entity.TaRaiseInvite;
 import com.huiju.estateagents.entity.TaSalesBatch;
-import com.huiju.estateagents.service.*;
+import com.huiju.estateagents.service.ITaRaiseService;
+import com.huiju.estateagents.service.ITaSalesBatchService;
+import com.huiju.estateagents.service.ITdCityService;
 import com.huiju.estateagents.service.impl.TaRaiseInviteServiceImpl;
-import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.lang.reflect.Array;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
 
 /**

src/main/java/com/huiju/estateagents/entity/TaQrcode.java

@@ -84,4 +84,16 @@ public class TaQrcode implements Serializable {
 
     @TableField(exist = false)
     private List<TaQrcode> qrcodeList;
+
+    /**
+     * 楼盘名称
+     */
+    @TableField(exist = false)
+    private String buildingName;
+
+    /**
+     * 渠道名称
+     */
+    @TableField(exist = false)
+    private String channelName;
 }

src/main/java/com/huiju/estateagents/mapper/TaMiniappMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaMiniappTemplate;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -16,6 +17,7 @@ import java.util.List;
  * @since 2019-09-11
  */
 @Mapper
+@Component
 public interface TaMiniappMapper extends BaseMapper<TaMiniapp> {
 
     List<TaMiniapp> getAllAvaliableMiniapps();

src/main/java/com/huiju/estateagents/mapper/TaQrcodeMapper.java

@@ -1,8 +1,13 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.bo.request.QrCodeStatisticResponseBO;
 import com.huiju.estateagents.entity.TaQrcode;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
 /**
  * <p>
@@ -13,6 +18,15 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2020-05-20
  */
 @Mapper
+@Component
 public interface TaQrcodeMapper extends BaseMapper<TaQrcode> {
 
+    QrCodeStatisticResponseBO getStatisticData(@Param("orgId") Integer orgId);
+
+    IPage<TaQrcode> listQrCodeByCondition(IPage<TaQrcode> page,
+                                          @Param("targetType") String targetType,
+                                          @Param("targetName") String targetName,
+                                          @Param("channelId") Integer channelId,
+                                          @Param("buildingId") String buildingId,
+                                          @Param("orgId") Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/ITaQrcodeService.java

@@ -1,7 +1,11 @@
 package com.huiju.estateagents.service;
 
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaQrcode;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * <p>
@@ -13,4 +17,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaQrcodeService extends IService<TaQrcode> {
 
+    ResponseBean listQrCodeByCondition(Integer pageNum, Integer pageSize, String targetType, String targetName, Integer channelId, String buildingId, Integer orgId);
+
+    ResponseBean saveQrcode(TaQrcode taQrcode, Integer userId, Integer orgId);
+
+    ResponseBean getStatisticData(Integer qrCodeId, Integer orgId);
+
 }

src/main/java/com/huiju/estateagents/service/impl/TaQrcodeServiceImpl.java

@@ -1,11 +1,28 @@
 package com.huiju.estateagents.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.bo.request.QrCodeStatisticResponseBO;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.WxQrCodeUtils;
+import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaQrcode;
+import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.mapper.TaQrcodeMapper;
+import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaQrcodeService;
+import org.checkerframework.checker.units.qual.A;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 二维码管理表 服务实现类
@@ -17,4 +34,107 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaQrcodeServiceImpl extends ServiceImpl<TaQrcodeMapper, TaQrcode> implements ITaQrcodeService {
 
+    private Logger logger = LoggerFactory.getLogger(TaQrcodeServiceImpl.class);
+
+    @Autowired
+    private TaQrcodeMapper taQrcodeMapper;
+
+    @Autowired
+    private TaMiniappMapper taMiniappMapper;
+
+    @Autowired
+    private IMiniAppService iMiniAppService;
+
+    /**
+     * 条件查询二维码列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param targetType
+     * @param targetName
+     * @param channelId
+     * @param buildingId
+     * @param orgId
+     * @return
+     */
+    @Override
+    public ResponseBean listQrCodeByCondition(Integer pageNum, Integer pageSize, String targetType, String targetName, Integer channelId, String buildingId, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaQrcode> pg = new Page<>(pageNum, pageSize);
+        responseBean.addSuccess(taQrcodeMapper.listQrCodeByCondition(pg, targetType, targetName, channelId, buildingId, orgId));
+        return responseBean;
+    }
+
+    /**
+     * 保存二维码信息
+     *
+     * @param taQrcode
+     * @param userId
+     * @param orgId
+     * @return
+     */
+    @Override
+    public ResponseBean saveQrcode(TaQrcode taQrcode, Integer userId, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 保存数据
+        taQrcode.setOrgId(orgId);
+        taQrcode.setCreateUser(userId);
+        taQrcode.setCreateDate(LocalDateTime.now());
+        taQrcode.setStatus(CommConstant.STATUS_NORMAL);
+        if (!save(taQrcode)) {
+            responseBean.addError("fail");
+            return responseBean;
+        }
+
+        // 获取appId
+        QueryWrapper<TaMiniapp> taMiniappQuery = new QueryWrapper<>();
+        taMiniappQuery.eq("org_id", orgId);
+        TaMiniapp taMiniapp = taMiniappMapper.selectOne(taMiniappQuery);
+
+        // 生成二维码
+        String paramsStr = WxQrCodeUtils.generateSceneAndPage(taQrcode.getTargetType(), "",
+                taQrcode.getTargetId(), taQrcode.getTargetType(), taQrcode.getChannelId() + "", taQrcode.getQrCodeId() + "", taQrcode.getBuildingId());
+        ResponseBean qrCodeResult = iMiniAppService.getQrCode(paramsStr, taMiniapp.getMiniappId());
+        if (qrCodeResult != null && ResponseBean.CODE_SUCCESS == qrCodeResult.getCode()) {
+            // 更新数据
+            taQrcode.setQrCodeUrl(qrCodeResult.getCode() + "");
+            if (updateById(taQrcode)) {
+                responseBean.addSuccess(taQrcode);
+                return responseBean;
+            }
+        }
+        removeById(taQrcode.getQrCodeId());
+        responseBean.addError("fail");
+        return responseBean;
+    }
+
+    /**
+     * 获取二维码统计
+     *
+     * @param qrCodeId
+     * @param orgId
+     * @return
+     */
+    @Override
+    public ResponseBean getStatisticData(Integer qrCodeId, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 获取二维码信息
+        TaQrcode taQrcode = taQrcodeMapper.selectById(qrCodeId);
+        if (taQrcode == null) {
+            responseBean.addError("fail");
+            return responseBean;
+        }
+
+        // 获取统计数据
+        QrCodeStatisticResponseBO statisticData = taQrcodeMapper.getStatisticData(orgId);
+
+        // 组装反参
+        JSONObject resultObj = new JSONObject();
+        resultObj.put("statistic", statisticData);
+        resultObj.put("qrCodeInfo", taQrcode);
+        responseBean.addSuccess(resultObj);
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/third/controller/TaThirdPartyMiniappConfigController.java

@@ -165,7 +165,7 @@ public class TaThirdPartyMiniappConfigController extends BaseController {
     }
 
     /**
-     * 第三方生成二维码
+     * 第三方生成
      * @return
      */
     @PostMapping("/third/qrcode")

src/main/resources/mapper/TaQrcodeMapper.xml

@@ -2,4 +2,36 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaQrcodeMapper">
 
+    <select id="listQrCodeByCondition" resultType="com.huiju.estateagents.entity.TaQrcode">
+    SELECT
+        t.*,
+        t2.building_name,
+        t3.channel_name
+    FROM
+        ta_qrcode t
+        LEFT JOIN ta_building t2 ON t.building_id = t2.building_id
+        LEFT JOIN ta_channel t3 ON t.channel_id = t3.channel_id
+    WHERE
+        t.`status` > - 1
+        AND t.org_id = #{orgId}
+        <if test = "buildingId == '' or buildingId == null">
+            AND t.building_id = #{buildingId}
+        </if>
+        <if test = "targetType == '' or targetType == null">
+            AND t.target_type = #{targetType}
+        </if>
+        <if test = "targetName == '' or targetName == null">
+            AND t.target_name = #{targetName}
+        </if>
+        <if test = "channelId == null">
+            AND t.channel_id = #{channelId}
+        </if>
+      ORDER BY
+        t.create_date DESC
+    </select>
+
+    <select id="getStatisticData" resultType="com.huiju.estateagents.bo.request.QrCodeStatisticResponseBO">
+
+    </select>
+
 </mapper>