Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/channel/sysChannel/controller/SysUserChannelController.java

@@ -10,18 +10,11 @@ import com.huiju.estateagents.center.sysUser.entity.SysToken;
 import com.huiju.estateagents.center.sysUser.entity.SysUser;
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import com.huiju.estateagents.center.sysUser.service.ISysUserService;
-import com.huiju.estateagents.center.taUser.entity.TaUser;
-import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
 import com.huiju.estateagents.channel.sysChannel.service.ITaChannelProxyService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.MD5Utils;
-import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.TaNewsType;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,8 +22,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 

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

@@ -440,6 +440,7 @@ public class CommConstant {
 	public static final Object GROUP_ACTIVITY = "groupActivity";
 	public static final String TARGET_TYPE_H5 = "H5";
     public static final String ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/checkin/index\"}";
+    public static final String DRAINAGE_QRCODE = "{\"scene\":\"h5id=#0&type=#1\",\"page\":\"pages/project/h5Page\"}";
     
     /**
      * 消息通知

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

@@ -173,4 +173,15 @@ public class StatisticalController extends BaseController {
                                             HttpServletRequest request) {
         return iStatisticalService.selectPersonFrom(getOrgId(request), startDate,endDate);
     }
+
+    /**
+     * 用户来源  折线图 首页
+     * @return
+     */
+    @GetMapping(value = "/admin/selectPersonFromGroupByDay")
+    public ResponseBean selectPersonFromGroupByDay(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                         @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                         HttpServletRequest request) {
+        return iStatisticalService.selectPersonFromGroupByDay(getOrgId(request), startDate,endDate);
+    }
 }

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

@@ -142,11 +142,11 @@ public class TaDrainageController extends BaseController {
                 taMiniappQuery.eq("org_id",getOrgId(request));
                 TaMiniapp taMiniapp = taMiniappMapper.selectOne(taMiniappQuery);
                 // 生成二维码
-                ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.ACTIVITY_QRCODE.replace("#0",taDrainage.getDrainageId().toString()).replace("#1","h5"),taMiniapp.getMiniappId());
+                ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.DRAINAGE_QRCODE.replace("#0",taDrainage.getDrainageId().toString()).replace("#1","h5"),taMiniapp.getMiniappId());
                 taDrainage.setQrCode(String.valueOf(taMiniappQrcode.getData()));
                 iTaDrainageService.updateById(taDrainage);
 
-                //添加第三方appid和secret
+                //添加第三方appid和secretis
                 TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = new TaThirdPartyMiniappConfig();
                 taThirdPartyMiniappConfig.setOrgId(getOrgId(request));
                 taThirdPartyMiniappConfig.setAppid(getUUIDS());

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

@@ -1,10 +1,13 @@
 package com.huiju.estateagents.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -42,4 +45,15 @@ public class TdWxDict implements Serializable {
     private String sceneAlias;
 
 
+    /**
+     * 来源人数合集
+     */
+    @TableField(exist = false)
+    private Integer fromData;
+
+    /**
+     * 注册人数合集
+     */
+    @TableField(exist = false)
+    private Integer registerSum;
 }

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

@@ -115,4 +115,13 @@ public interface IStatisticalService {
      * @return
      */
     ResponseBean selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate);
+
+    /**
+     * 用户来源数据统计折线图
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    ResponseBean selectPersonFromGroupByDay(Integer orgId, LocalDate startDate, LocalDate endDate);
 }

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

@@ -1,10 +1,12 @@
 package com.huiju.estateagents.service.impl;
 
+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.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
+import com.huiju.estateagents.entity.TdWxDict;
 import com.huiju.estateagents.exception.EstaException;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.po.PersonPO;
@@ -16,7 +18,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 数据统计
@@ -47,6 +54,9 @@ public class StatisticalServiceImpl implements IStatisticalService {
     @Autowired
     private TsPersonFromStatisticMapper tsPersonFromStatisticMapper;
 
+    @Autowired
+    private TdWxDictMapper tdWxDictMapper;
+
 
     @Override
     public ResponseBean indexStatistical(Integer orgId) {
@@ -318,7 +328,75 @@ public class StatisticalServiceImpl implements IStatisticalService {
      */
     @Override
     public ResponseBean selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate) {
+        ResponseBean responseBean = new ResponseBean();
         List<TsPersonFromStatistic> list = tsPersonFromStatisticMapper.selectPersonFrom(orgId,startDate,endDate);
-        return null;
+        QueryWrapper<TdWxDict> tdWxDictQueryWrapper = new QueryWrapper<>();
+        tdWxDictQueryWrapper.groupBy("scene_type");
+        List<TdWxDict> tdWxDicts = tdWxDictMapper.selectList(tdWxDictQueryWrapper);
+        tdWxDicts.forEach(e -> {
+            int fromSum = list.stream().filter(l -> e.getSceneType().equals(l.getSceneType())).mapToInt(TsPersonFromStatistic::getFromNum).sum();
+            int registerSum = list.stream().filter(l -> e.getSceneType().equals(l.getSceneType())).mapToInt(TsPersonFromStatistic::getRegisteredNum).sum();
+            e.setFromData(fromSum);
+            e.setRegisterSum(registerSum);
+        });
+        Map<String,Object> map = new HashMap<>();
+        map.put("tdWxDicts",tdWxDicts);
+        List<TsPersonFromStatistic> tableList = tsPersonFromStatisticMapper.selectPersonFromGroupByData(orgId,startDate,endDate);
+        map.put("list",tableList);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    /**
+     * 用户来源数据统计折线图
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    @Override
+    public ResponseBean selectPersonFromGroupByDay(Integer orgId, LocalDate startDate, LocalDate endDate) {
+        List<TsPersonFromStatistic> dayList = getDayList(startDate, endDate);
+        List<TsPersonFromStatistic> list = tsPersonFromStatisticMapper.selectPersonFromGroupByDay(orgId,startDate,endDate);
+        dayList.forEach(e -> {
+            list.forEach(l -> {
+                if (e.getCreateTime().equals(l.getCreateTime())){
+                    e.setFromNum(l.getFromNum());
+                    e.setRegisteredNum(l.getRegisteredNum());
+                }
+            });
+        });
+        return ResponseBean.success(dayList);
+    }
+
+    /**
+     * 返回时间区间格式
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    private List<TsPersonFromStatistic> getDayList(LocalDate startDate, LocalDate endDate) {
+        if (null == startDate || null == endDate){
+            endDate = LocalDate.now();
+            startDate = LocalDate.now().plusDays(-7);
+        }
+
+        //获取时间区间
+        List<LocalDate> dates = Stream.iterate(startDate, date -> date.plusDays(1))
+                .limit(ChronoUnit.DAYS.between(startDate, endDate))
+                .collect(Collectors.toList());
+
+        //格式化时间
+        List<TsPersonFromStatistic> dataList = new ArrayList<>();
+        DateTimeFormatter dtf3 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        dates.forEach(e -> {
+            TsPersonFromStatistic tsPersonFromStatistic = new TsPersonFromStatistic();
+            tsPersonFromStatistic.setRegisteredNum(0);
+            tsPersonFromStatistic.setFromNum(0);
+            tsPersonFromStatistic.setCreateTime(dtf3.format(e));
+            dataList.add(tsPersonFromStatistic);
+        });
+        return dataList;
     }
 }

src/main/java/com/huiju/estateagents/statistic/entity/TsPersonFromStatistic.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.statistic.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -59,4 +60,10 @@ public class TsPersonFromStatistic implements Serializable {
      * 注册数量
      */
     private Integer registeredNum;
+
+    /**
+     * 时间
+     */
+    @TableField(exist = false)
+    private String createTime;
 }

src/main/java/com/huiju/estateagents/statistic/mapper/TsPersonFromStatisticMapper.java

@@ -21,4 +21,8 @@ public interface TsPersonFromStatisticMapper extends BaseMapper<TsPersonFromStat
     void insertStatisticList(List<TsPersonFromStatistic> list);
 
     List<TsPersonFromStatistic> selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate);
+
+    List<TsPersonFromStatistic> selectPersonFromGroupByDay(Integer orgId, LocalDate startDate, LocalDate endDate);
+
+    List<TsPersonFromStatistic> selectPersonFromGroupByData(Integer orgId, LocalDate startDate, LocalDate endDate);
 }

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -621,12 +621,18 @@ FROM
         a.name AS name,
         a.phone as phone,
         if(a.sex = 1, '男', if(a.sex = 2, '女', '未知')) as sex,
-        b.name as consultantName,
-        b.tel as consultTel
+        CASE
+        WHEN b.NAME IS NULL THEN
+        c.NAME ELSE b.NAME
+        END AS consultantName,
+        CASE
+        WHEN b.tel IS NULL THEN
+        c.tel ELSE b.tel
+        END AS consultTel
         FROM
         ta_recommend_customer a
-        LEFT JOIN ta_person b ON (a.realty_consultant = b.person_id or a.realty_consultant = b.user_id)
-        LEFT JOIN ta_person c on a.recommend_person = c.person_id
+        LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        left join ta_person c on a.realty_consultant = c.user_id
         <where>
             a.status > 0
             and a.verify_status = 1

src/main/resources/mapper/statistic/TsPersonFromStatisticMapper.xml

@@ -13,13 +13,54 @@
         SELECT
             *
         FROM
-        ta_person_from_record tp
-        where tp.org_id = #{org}
+        ts_person_from_statistic tp
+        where tp.org_id = #{orgId}
         <if test="startDate != null or endDate != null">
             AND  tp.create_date BETWEEN #{startDate} and #{endDate}
         </if>
         <if test="startDate == null or endDate == null">
             AND tp.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
+
+    </select>
+    <select id="selectPersonFromGroupByDay"
+            resultType="com.huiju.estateagents.statistic.entity.TsPersonFromStatistic">
+        SELECT
+            sum( tp.from_num ) AS from_num,
+            sum( tp.registered_num ) AS registered_num,
+            DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) AS create_time
+        FROM
+            ts_person_from_statistic tp
+        WHERE
+            tp.org_id = #{orgId}
+        <if test="startDate != null or endDate != null">
+            AND  tp.create_date BETWEEN #{startDate} and #{endDate}
+        </if>
+        <if test="startDate == null or endDate == null">
+            AND tp.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
+        </if>
+        GROUP BY
+            DATE_FORMAT( tp.create_date, '%Y-%m-%d' )
+    </select>
+    <select id="selectPersonFromGroupByData"
+            resultType="com.huiju.estateagents.statistic.entity.TsPersonFromStatistic">
+        SELECT
+        sum( tp.from_num ) AS from_num,
+        sum( tp.registered_num ) AS registered_num,
+        DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) AS create_time,
+        tp.scene_type
+        FROM
+        ts_person_from_statistic tp
+        WHERE
+        tp.org_id = #{orgId}
+        <if test="startDate != null or endDate != null">
+            AND  tp.create_date BETWEEN #{startDate} and #{endDate}
+        </if>
+        <if test="startDate == null or endDate == null">
+            AND tp.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
+        </if>
+        GROUP BY
+        DATE_FORMAT( tp.create_date, '%Y-%m-%d' ),
+        tp.scene_type
     </select>
 </mapper>