分析统计

src/main/java/com/huiju/estateagents/statistic/controller/TaCustomerGenderStatisticController.java

@@ -18,6 +18,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
     * 客户分析性别统计表 小程序盘客工具客户分析 前端控制器
@@ -27,7 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2019-11-08
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaCustomerGenderStatisticController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaCustomerGenderStatisticController.class);
@@ -146,4 +149,29 @@ public class TaCustomerGenderStatisticController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 微信端查询三条性别列表数据
+     * @return
+     */
+    @RequestMapping(value="/wx/genderStatistic/{customerType}",method= RequestMethod.GET)
+    public ResponseBean wxCustomerGenderStatisticList(@PathVariable(value = "customerType") String customerType, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //查询当前小程序的男女比统计
+            QueryWrapper<TaCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.eq("customer_type",customerType);
+            queryWrapper.orderByDesc("create_date");
+     
+            List<TaCustomerGenderStatistic> result = iTaCustomerGenderStatisticService.list(queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerGenderStatisticList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
 }

src/main/java/com/huiju/estateagents/statistic/controller/TaCustomerStatisticDailyController.java

@@ -18,6 +18,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
     * 客户分析日统计表 小程序盘客工具客户分析 前端控制器
@@ -27,7 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2019-11-08
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaCustomerStatisticDailyController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaCustomerStatisticDailyController.class);
@@ -146,4 +149,24 @@ public class TaCustomerStatisticDailyController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 微信端查询日客户分析统计数据
+     * 日筛选：可以选择包括当前日往前的31日
+     * @return
+     */
+    @RequestMapping(value="/wx/customerStatisticDaily/{customerType}",method= RequestMethod.GET)
+    public ResponseBean wxCustomerStatisticDailyList(@PathVariable(value = "customerType") String customerType,
+                                                     HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            List<TaCustomerStatisticDaily> list = iTaCustomerStatisticDailyService.getDailyList(customerType,getOrgId(request));
+            responseBean.addSuccess(list);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("wxCustomerStatisticDailyList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/statistic/controller/TaCustomerStatisticMonthlyController.java

@@ -18,6 +18,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
     * 客户分析月统计表 小程序盘客工具客户分析 前端控制器
@@ -27,7 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2019-11-08
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaCustomerStatisticMonthlyController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaCustomerStatisticMonthlyController.class);
@@ -146,4 +149,25 @@ public class TaCustomerStatisticMonthlyController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 微信端查询月客户分析统计数据
+     * 月筛选：可以选择包括当前月往前的12个月
+     * @return
+     */
+    @RequestMapping(value="/wx/customerStatisticMonthly/{customerType}",method= RequestMethod.GET)
+    public ResponseBean taCustomerStatisticMonthlyList(@PathVariable(value = "customerType") String customerType,
+                                                       HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //查询月客户分析数据
+            List<TaCustomerStatisticMonthly> result = iTaCustomerStatisticMonthlyService.getCustomerMonthlyList(customerType, getOrgId(request));
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerStatisticMonthlyList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -42,4 +42,14 @@ public interface TaCustomerStatisticDailyMapper extends BaseMapper<TaCustomerSta
 	 * @return
 	 */
 	List<TaCustomerStatisticDaily> getVisiteCustomerData(@Param("nowDate") LocalDateTime nowDate,@Param("checkin") int checkin);
+	
+	/**
+	 * 获取31天的统计数据
+	 * @param customerType
+	 * @param orgId
+	 * @param nowDate
+	 * @param beforeDate
+	 * @return
+	 */
+	List<TaCustomerStatisticDaily> getDailyList(@Param("customerType") String customerType,@Param("orgId")  Integer orgId,@Param("nowDate")  LocalDateTime nowDate,@Param("beforeDate")  LocalDateTime beforeDate);
 }

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

@@ -41,4 +41,14 @@ public interface TaCustomerStatisticMonthlyMapper extends BaseMapper<TaCustomerS
 	 * @return
 	 */
 	List<TaCustomerStatisticMonthly> getVisiteStatisticMonthly(@Param("nowDate") LocalDateTime nowDate,@Param("checkin") int checkin);
+	
+	/**
+	 * 获取12个月的统计数据
+	 * @param customerType
+	 * @param orgId
+	 * @param nowDate
+	 * @param beforeDate
+	 * @return
+	 */
+	List<TaCustomerStatisticMonthly> getMonthlyList(@Param("customerType") String customerType,@Param("orgId") Integer orgId,@Param("nowDate") LocalDateTime nowDate,@Param("beforeDate") LocalDateTime beforeDate);
 }

src/main/java/com/huiju/estateagents/statistic/service/ITaCustomerStatisticDailyService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -32,4 +33,12 @@ public interface ITaCustomerStatisticDailyService extends IService<TaCustomerSta
 	 * @param nowDate
 	 */
 	void visiteStatisticDaily(LocalDateTime nowDate);
+	
+	/**
+	 * 获取日统计数据
+	 * @param customerType
+	 * @param orgId
+	 * @return
+	 */
+	List<TaCustomerStatisticDaily> getDailyList(String customerType, Integer orgId);
 }

src/main/java/com/huiju/estateagents/statistic/service/ITaCustomerStatisticMonthlyService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -32,4 +33,12 @@ public interface ITaCustomerStatisticMonthlyService extends IService<TaCustomerS
 	 * @param nowDate
 	 */
 	void visiteStatisticMonthly(LocalDateTime nowDate);
+	
+	/**
+	 * 查询12个月的客户统计分析数据
+	 * @param customerType
+	 * @param orgId
+	 * @return
+	 */
+	List<TaCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId);
 }

src/main/java/com/huiju/estateagents/statistic/service/impl/TaCustomerStatisticDailyServiceImpl.java

@@ -73,6 +73,24 @@ public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerS
 		statisticDailySaveBatch(saveList,nowDate,CommConstant.CUSTOMER_TYPE_VISITE);
 	}
 	
+	/**
+	 * 获取日统计数据
+	 *
+	 * @param customerType
+	 * @param orgId
+	 * @return
+	 */
+	@Override
+	public List<TaCustomerStatisticDaily> getDailyList(String customerType, Integer orgId) {
+		//当前日期
+		LocalDateTime nowDate = LocalDateTime.now();
+		//31天前的日期
+		LocalDateTime beforeDate = nowDate.plusDays(-31);
+		//获取31天的日期数据
+		List<TaCustomerStatisticDaily> list = customerStatisticDailyMapper.getDailyList(customerType,orgId,nowDate,beforeDate);
+		return list;
+	}
+	
 	/**
 	 * 批量保存当天的统计数据
 	 * @param list

src/main/java/com/huiju/estateagents/statistic/service/impl/TaCustomerStatisticMonthlyServiceImpl.java

@@ -3,6 +3,7 @@ package com.huiju.estateagents.statistic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
 import com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly;
 import com.huiju.estateagents.statistic.mapper.TaCustomerStatisticMonthlyMapper;
 import com.huiju.estateagents.statistic.service.ITaCustomerStatisticMonthlyService;
@@ -71,6 +72,24 @@ public class TaCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TaCustome
 		statisticMonthlySaveBatch(newVisiteMonthList,nowDate, CommConstant.CUSTOMER_TYPE_FOLLOW);
 	}
 	
+	/**
+	 * 查询12个月的客户统计分析数据
+	 *
+	 * @param customerType
+	 * @param orgId
+	 * @return
+	 */
+	@Override
+	public List<TaCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId) {
+		//当前日期
+		LocalDateTime nowDate = LocalDateTime.now();
+		//12个月前的日期
+		LocalDateTime beforeDate = nowDate.plusMonths(-12);
+		//获取31天的日期数据
+		List<TaCustomerStatisticMonthly> list = customerStatisticMonthlyMapper.getMonthlyList(customerType,orgId,nowDate,beforeDate);
+		return list;
+	}
+	
 	/**
 	 * 批量保存当月的统计数据
 	 * @param list

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

@@ -41,4 +41,16 @@
         GROUP BY
             c.org_id
     </select>
+
+    <select id="getDailyList" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily">
+        SELECT
+          *
+        FROM
+          ta_customer_statistic_daily
+        WHERE
+          org_id = #{orgId}
+        AND customer_type = #{customerType}
+        AND date_format( create_date, '%Y-%m-%d' ) >= date_format( #{beforeDate}, '%Y-%m-%d' )
+        AND date_format( create_date, '%Y-%m-%d' ) &lt;= date_format( #{nowDate}, '%Y-%m-%d' )
+    </select>
 </mapper>

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

@@ -44,4 +44,15 @@
         GROUP BY
             c.org_id
     </select>
+    <select id="getMonthlyList" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly">
+        SELECT
+          *
+        FROM
+          ta_customer_statistic_monthly
+        WHERE
+          org_id = #{orgId}
+        AND customer_type = #{customerType}
+        AND date_format( create_date, '%Y-%m-%d' ) >= date_format( #{beforeDate}, '%Y-%m-%d' )
+        AND date_format( create_date, '%Y-%m-%d' ) &lt;= date_format( #{nowDate}, '%Y-%m-%d' )
+    </select>
 </mapper>