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

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

@@ -224,12 +224,8 @@ public class TaQrcodeController extends BaseController {
 
     @RequestMapping(value = "/admin/getStatisticRecordExport", method = RequestMethod.GET)
     public void getStatisticRecordExport(Integer qrCodeId, Integer type, HttpServletRequest request, HttpServletResponse response) {
-        ExcelWriter writer = null;
-        OutputStream outputStream = null;
         try {
-            outputStream = response.getOutputStream();
-            iTaQrcodeService.getStatisticRecordExport(type,qrCodeId,getOrgId(request));
-            outputStream.flush();
+            iTaQrcodeService.getStatisticRecordExport(type, qrCodeId, getOrgId(request), response);
         } catch (Exception e) {
             e.printStackTrace();
         } finally {

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -109,6 +110,35 @@ public class TaCustomerFrom implements Serializable {
      */
     private String remark;
 
+    /**
+     * 用户名
+     */
+    @TableField(exist = false)
+    private String userName;
+
+    /**
+     * 用户手机号码
+     */
+    @TableField(exist = false)
+    private String userTel;
+
+    /**
+     * 用户性别
+     */
+    @TableField(exist = false)
+    private Integer sex;
+
+    /**
+     * 归属城市
+     */
+    @TableField(exist = false)
+    private String city;
+
+    /**
+     * 用户注册时间
+     */
+    @TableField(exist = false)
+    private LocalDateTime registerTime;
 
     /**
      * 渠道 ID

src/main/java/com/huiju/estateagents/excel/QrCodeStatistics/QrCodeNewPersonNum.java

@@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Data
 public class QrCodeNewPersonNum {
     /**
@@ -38,6 +40,6 @@ public class QrCodeNewPersonNum {
      * 访问次数
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "访问次数", index = 4)
-    private String visitNum;
+    @ExcelProperty(value = "注册时间", index = 4)
+    private LocalDateTime registerTime;
 }

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

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
 /**
  * <p>
@@ -27,5 +29,5 @@ public interface ITaQrcodeService extends IService<TaQrcode> {
 
     ResponseBean getStatisticRecord(Integer type, Integer pageNum, Integer pageSize, Integer qrCodeId, Integer orgId);
 
-    void getStatisticRecordExport(Integer type, Integer qrCodeId, Integer orgId);
+    void getStatisticRecordExport(Integer type, Integer qrCodeId, Integer orgId, HttpServletResponse response) throws IOException;
 }

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

@@ -25,6 +25,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -152,13 +154,13 @@ public class TaQrcodeServiceImpl extends ServiceImpl<TaQrcodeMapper, TaQrcode> i
         Integer visitNum = taQrcodeMapper.getVisitNum(qrCodeId, orgId);
 
         // 查询新增用户数
-//        Integer newPersons = taQrcodeMapper.getNewPersons(qrCodeId, orgId);
+        Integer newPersons = taQrcodeMapper.getNewPersons(qrCodeId, orgId);
 
         // 组装反参
         JSONObject resultObj = new JSONObject();
         resultObj.put("visitPersons", visitPersons);
         resultObj.put("visitNum", visitNum);
-//        resultObj.put("newPersons", newPersons);
+        resultObj.put("newPersons", newPersons);
         resultObj.put("qrCodeInfo", taQrcode);
         responseBean.addSuccess(resultObj);
         return responseBean;
@@ -186,19 +188,24 @@ public class TaQrcodeServiceImpl extends ServiceImpl<TaQrcodeMapper, TaQrcode> i
     }
 
     @Override
-    public void getStatisticRecordExport(Integer type, Integer qrCodeId, Integer orgId) {
+    public void getStatisticRecordExport(Integer type, Integer qrCodeId, Integer orgId, HttpServletResponse response) throws IOException {
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
         switch (type) {
             case 1:
                 List<QrCodeVisitPersonNum> records = taQrcodeMapper.getVisitPersonsRecordExport(qrCodeId,orgId);
-                EasyExcel.write("访问人数.xlsx", QrCodeVisitPersonNum.class).sheet("访问人数").doWrite(records);
+                response.setHeader("Content-disposition", "attachment;filename=访问人数.xlsx");
+                EasyExcel.write(response.getOutputStream(), QrCodeVisitPersonNum.class).sheet("访问人数").doWrite(records);
                 break;
             case 2:
                 List<QrCodeVisitNum> records2 = taQrcodeMapper.getVisitNumRecordExport(qrCodeId, orgId);
-                EasyExcel.write("访问次数.xlsx", QrCodeVisitNum.class).sheet("访问次数").doWrite(records2);
+                response.setHeader("Content-disposition", "attachment;filename=访问次数.xlsx");
+                EasyExcel.write(response.getOutputStream(), QrCodeVisitNum.class).sheet("访问次数").doWrite(records2);
                 break;
             case 3:
                 List<QrCodeNewPersonNum> records3 = taQrcodeMapper.getNewPersonsRecordExport(qrCodeId, orgId);
-                EasyExcel.write("新增注册用户.xlsx", QrCodeNewPersonNum.class).sheet("新增注册用户").doWrite(records3);
+                response.setHeader("Content-disposition", "attachment;filename=新增注册用户.xlsx");
+                EasyExcel.write(response.getOutputStream(), QrCodeNewPersonNum.class).sheet("新增注册用户").doWrite(records3);
                 break;
             default:
                 break;

src/main/resources/log/logback-spring.xml

@@ -2,58 +2,120 @@
 <configuration debug="false">
     <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
     <property name="LOG_HOME" value="/home/dev/estateagents/service/logs" />
+
     <!-- 控制台输出 -->
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- 日志输出编码 -->
+        <!--<Encoding>UTF-8</Encoding>-->
+        <layout class="ch.qos.logback.classic.PatternLayout">
             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+            </pattern>
+        </layout>
+    </appender>
+
+    <!-- 时间滚动输出 level为 INFO 日志 -->
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文件的路径及文件名 -->
+        <file>${LOG_HOME}/log_info.log</file>
+        <!--日志文件输出格式-->
+        <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
         </encoder>
-    </appender>
-    <!-- 按照每天生成日志文件 -->
-    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/estateagents-%d{yyyy-MM-dd}.log</FileNamePattern>
+            <!-- 每天日志归档路径以及格式 -->
+            <fileNamePattern>${LOG_HOME}/info/log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
             <!--日志文件保留天数-->
-            <MaxHistory>30</MaxHistory>
+            <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-        </encoder>
-        <!--日志文件最大的大小-->
-<!--        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
-<!--            <MaxFileSize>10MB</MaxFileSize>-->
-<!--        </triggeringPolicy>-->
+        <!-- 此日志文件只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
     </appender>
 
-    <!-- 按照每天生成日志文件 -->
-    <appender name="MYSQL"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <!-- 时间滚动输出 level为 WARN 日志 -->
+    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文件的路径及文件名 -->
+        <file>${LOG_HOME}/log_warn.log</file>
+        <!--日志文件输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/estateagents-%d{yyyy-MM-dd}-sql.log</FileNamePattern>
+            <fileNamePattern>${LOG_HOME}/warn/log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
             <!--日志文件保留天数-->
-            <MaxHistory>30</MaxHistory>
+            <maxHistory>15</maxHistory>
         </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+        <!-- 此日志文件只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 时间滚动输出 level为 ERROR 日志 -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文件的路径及文件名 -->
+        <file>${LOG_HOME}/log_error.log</file>
+        <!--日志文件输出格式-->
+        <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
         </encoder>
-        <!--日志文件最大的大小-->
-<!--                <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
-<!--                    <MaxFileSize>1024MB</MaxFileSize>-->
-<!--                </triggeringPolicy>-->
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_HOME}/error/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文件只记录ERROR级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
     </appender>
 
+    <!-- show parameters for hibernate sql 专为 Hibernate 定制 -->
+    <!-- <logger name="org.hibernate.type.descriptor.sql.BasicBinder"  level="TRACE" />
+    <logger name="org.hibernate.type.descriptor.sql.BasicExtractor"  level="DEBUG" />
+    <logger name="org.hibernate.SQL" level="DEBUG" />
+    <logger name="org.hibernate.engine.QueryParameters" level="DEBUG" />
+    <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" /> -->
+
     <!--myibatis log configure-->
+    <!--<logger name="com.apache.ibatis" level="TRACE"/>-->
+    <!--<logger name="java.sql.Connection" level="DEBUG"/>-->
+    <!--<logger name="java.sql.Statement" level="DEBUG"/>-->
+    <!--<logger name="java.sql.PreparedStatement" level="DEBUG"/>-->
     <logger name="com.huiju.estateagents.mapper" level="DEBUG" additivity="false">
         <appender-ref ref="MYSQL" />
     </logger>
 
     <!-- 日志输出级别 -->
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-        <appender-ref ref="FILE" />
-        <appender-ref ref="MYSQL" />
+    <root level="info">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="INFO_FILE" />
+        <appender-ref ref="WARN_FILE" />
+        <appender-ref ref="ERROR_FILE" />
     </root>
+
+
 </configuration>

src/main/resources/mapper/TaQrcodeMapper.xml

@@ -51,7 +51,13 @@
     </select>
 
     <select id="getNewPersons" resultType="java.lang.Integer">
-
+        SELECT
+            count( DISTINCT t.person_id )
+        FROM
+            ta_customer_from t
+        WHERE
+            t.org_id = #{orgId}
+            AND t.qr_code_id = #{qrCodeId}
     </select>
 
     <select id="getVisitPersonsRecord" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
@@ -122,12 +128,35 @@
             AND t.qrcode_id = #{qrCodeId}
     </select>
 
-    <select id="getNewPersonsRecord" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
-
+    <select id="getNewPersonsRecord" resultType="com.huiju.estateagents.entity.TaCustomerFrom">
+        SELECT
+            t.*,
+            t2.`name` userName,
+            t2.phone userTel,
+            t2.sex,
+            t2.city ,
+            t2.create_date registerTime
+        FROM
+            ta_customer_from t
+            LEFT JOIN ta_recommend_customer t2 ON t.person_id = t2.person_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.qr_code_id = #{qrCodeId}
     </select>
 
     <select id="getNewPersonsRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeNewPersonNum">
-
+        SELECT
+            t2.`name` nickName,
+            t2.tel phone,
+            t2.sex gender,
+            t2.city province,
+            t.create_date registerTime
+        FROM
+            ta_customer_from t
+            LEFT JOIN ta_recommend_customer t2 ON t.person_id = t2.person_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.qr_code_id = #{qrCodeId}
     </select>
 
 </mapper>