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

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java

@@ -33,4 +33,6 @@ public interface TaUserMapper extends BaseMapper<TaUser> {
     Integer validateWeight(@Param("buildingIds") List<String> buildingIds, @Param("buildingId") String buildingId, @Param("weight") String weight, @Param("userId")Integer userId);
 
     TaUser getAdminByAppID(@Param("appid") String appID);
+
+    List<String> getBuildingIdsOf(@Param("userId") Integer userId,@Param("buildingId") String buildingId);
 }

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

@@ -1,25 +1,18 @@
 package com.huiju.estateagents.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 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.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuildingReport;
 import com.huiju.estateagents.service.ITaBuildingReportService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-import com.huiju.estateagents.base.BaseController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
@@ -52,7 +45,7 @@ public class TaBuildingReportController extends BaseController {
      */
     @RequestMapping(value="/admin/taBuildingReports",method= RequestMethod.GET)
     public ResponseBean taBuildingReportList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                             @RequestParam(value ="pageSize",defaultValue = "20") Integer pageSize,
                                              HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.ExcelUtils;
 import com.huiju.estateagents.common.StringUtils;
@@ -15,6 +16,7 @@ import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.excel.ConsultantKPIExport;
 import com.huiju.estateagents.excel.TaActivityDynamicEnlistExport;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
+import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -76,11 +78,12 @@ public class TsConsultantKpiController extends BaseController {
         }
 
         Integer orgId = getOrgId(request);
+        Integer userId = getUserId(request);
         try {
             // 汇总明细
-            IPage<TsConsultantKpi> result = iTsConsultantKpiService.stsKPIDaily(pageNum, pageSize, orgId, buildingId, startDate, endDate, StringUtils.humpToLine(asc), StringUtils.humpToLine(desc));
+            IPage<TsConsultantKpi> result = iTsConsultantKpiService.stsKPIDaily(pageNum, pageSize, orgId, userId, buildingId, startDate, endDate, StringUtils.humpToLine(asc), StringUtils.humpToLine(desc));
             // 汇总
-            TsConsultantKpi total = iTsConsultantKpiService.stsKPITotalByOrg(orgId, buildingId, startDate, endDate);
+            TsConsultantKpi total = iTsConsultantKpiService.stsKPITotalByOrg(orgId, userId, buildingId, startDate, endDate);
             return ResponseBean.success(new HashMap<String, Object>(){{
                 put("paged", result);
                 put("total", total);
@@ -116,10 +119,11 @@ public class TsConsultantKpiController extends BaseController {
         }
 
         Integer orgId = getOrgId(request);
+        Integer userId = getUserId(request);
         try {
 
             // 汇总明细
-            List<ConsultantKPIExport> result = iTsConsultantKpiService.stsKPIDailyExport(orgId, buildingId, startDate, endDate);
+            List<ConsultantKPIExport> result = iTsConsultantKpiService.stsKPIDailyExport(orgId, userId, buildingId, startDate, endDate);
             ExcelUtils.flush(response, ConsultantKPIExport.class, result, "置业顾问KPI统计" + DateUtils.today());
         } catch (Exception e){
 //            e.printStackTrace();
@@ -139,7 +143,7 @@ public class TsConsultantKpiController extends BaseController {
             }
 
             startTime = DateUtils.day2LocalDateime(startDate.substring(0,4) + "-" + startDate.substring(4, 6) + "-" + startDate.substring(6, 8));
-            endTime = DateUtils.day2LocalDateime(endDate.substring(0,4) + "-" + endDate.substring(4, 6) + "-" + endDate.substring(6, 8));
+            endTime = DateUtils.dayToLocalDateime(endDate.substring(0,4) + "-" + endDate.substring(4, 6) + "-" + endDate.substring(6, 8) + " 23:59:59");
         }
 
         return new LocalDateTime[]{startTime, endTime};

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

@@ -86,4 +86,6 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
     List<TaPersonVisitRecord> selectData();
 
     List<TaPersonVisitRecord> selectTapersonFromShare();
+
+    Integer selectTodayVisitCount(@Param("orgId") Integer orgId,@Param("nowDate") LocalDateTime now);
 }

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

@@ -2,7 +2,6 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaShareCount;
 import com.huiju.estateagents.entity.TsConsultantKpi;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.excel.ConsultantKPIExport;
@@ -23,27 +22,47 @@ import java.util.List;
 @Mapper
 public interface TsConsultantKpiMapper extends BaseMapper<TsConsultantKpi> {
 
+    /**
+     * 置业KPI 汇总
+     * @param page
+     * @param orgId
+     * @param buildingIds
+     * @param startDate
+     * @param endDate
+     * @param asc
+     * @param desc
+     * @return
+     */
     IPage<TsConsultantKpi> stsKPIDaily(IPage<TsConsultantKpi> page,
                                        @Param("orgId") Integer orgId,
-                                       @Param("buildingId") String buildingId,
+                                       @Param("buildingIds") List<String> buildingIds,
                                        @Param("startDate") String startDate,
                                        @Param("endDate") String endDate,
                                        @Param("asc") String asc,
                                        @Param("desc") String desc);
 
-    TsConsultantKpi stsKPITotalByOrg(@Param("orgId") Integer orgId, @Param("buildingId") String buildingId, @Param("startDate") String startDate, @Param("endDate") String endDate);
+    TsConsultantKpi stsKPITotalByOrg(@Param("orgId") Integer orgId,
+                                     @Param("buildingIds") List<String> buildingIds,
+                                     @Param("startDate") String startDate,
+                                     @Param("endDate") String endDate);
 
-    List<ConsultantKPIExport> stsKPIDailyExport(@Param("orgId") Integer orgId, @Param("buildingId") String buildingId, @Param("startDate") String startDate, @Param("endDate") String endDate);
+    List<ConsultantKPIExport> stsKPIDailyExport(@Param("orgId") Integer orgId,
+                                                @Param("buildingIds") List<String> buildingIds,
+                                                @Param("startDate") String startDate,
+                                                @Param("endDate") String endDate);
 
     /**
      * 统计当前时间段内的, 已经固化的置业数据的所有客户
      * @param orgId
-     * @param buildingId
+     * @param buildingIds
      * @param startDate
      * @param endDate
      * @return
      */
-    Integer stsAllCustomersByOrg(@Param("orgId") Integer orgId, @Param("buildingId") String buildingId, @Param("startDate") String startDate, @Param("endDate") String endDate);
+    Integer stsAllCustomersByOrg(@Param("orgId") Integer orgId,
+                                 @Param("buildingIds") List<String> buildingIds,
+                                 @Param("startDate") String startDate,
+                                 @Param("endDate") String endDate);
 
 
     /**

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

@@ -18,11 +18,11 @@ import java.util.List;
  */
 public interface ITsConsultantKpiService extends IService<TsConsultantKpi> {
 
-    IPage<TsConsultantKpi> stsKPIDaily(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, String startDate, String endDate, String asc, String desc);
+    IPage<TsConsultantKpi> stsKPIDaily(Integer pageNum, Integer pageSize, Integer orgId, Integer userId, String buildingId, String startDate, String endDate, String asc, String desc);
 
-    TsConsultantKpi stsKPITotalByOrg(Integer orgId, String buildingId, String startDate, String endDate);
+    TsConsultantKpi stsKPITotalByOrg(Integer orgId, Integer userId, String buildingId, String startDate, String endDate);
 
-    List<ConsultantKPIExport> stsKPIDailyExport(Integer orgId, String buildingId, String startDate, String endDate);
+    List<ConsultantKPIExport> stsKPIDailyExport(Integer orgId, Integer userId, String buildingId, String startDate, String endDate);
 
     IPage<TaRecommendCustomer> getCustomerListOfConsultant(IPage<TaRecommendCustomer> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate);
 

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

@@ -80,10 +80,13 @@ public class StatisticalServiceImpl implements IStatisticalService {
         Integer selectRecentlyCount = taPersonMapper.selectTodayRecentlyCount(orgId, LocalDateTime.now());
 
         // -------  用户来源 end ------------
+        //今日访问次数
+        Integer selectVisitCount = taPersonVisitRecordMapper.selectTodayVisitCount(orgId, LocalDateTime.now());
 
         map.put("selectUserCount", selectUserCount);
         map.put("selectRegisteredCount", selectRegisteredCount);
         map.put("selectRecentlyCount", selectRecentlyCount);
+        map.put("selectVisitCount", selectVisitCount);
 
         responseBean.addSuccess(map);
 

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

@@ -2,6 +2,8 @@ package com.huiju.estateagents.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.excel.ConsultantKPIExport;
@@ -13,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,34 +31,72 @@ public class TsConsultantKpiServiceImpl extends ServiceImpl<TsConsultantKpiMappe
     @Autowired
     TsConsultantKpiMapper tsConsultantKpiMapper;
 
+    @Autowired
+    TaUserMapper taUserMapper;
+
     @Autowired
     TaRecommendCustomerMapper taRecommendCustomerMapper;
 
+    /**
+     * 获取用户授权楼盘
+     * 如果 buildingId 参数存在, 则校验参数是否在授权范围内
+     *
+     * @param userId
+     * @param buildingId
+     * @return List 长度 0 代表未授权楼盘, null 代表管理员, 不校验楼盘授权
+     */
+    public List<String> getBuildingListOf(Integer userId, String buildingId) {
+        List<String> unAuthrized = new ArrayList<String>(){{
+            add("*");   // 构造SQL  building_id in ('*') , 目的是为了阻止检索到数据
+        }};
+
+        TaUser taUser = taUserMapper.selectById(userId);
+        if (taUser == null) {
+            return unAuthrized;
+        }
+
+        if (taUser.getIsAdmin()) {
+            if (!StringUtils.isEmpty(buildingId)) {
+                return new ArrayList<String>(){{
+                    add(buildingId);
+                }};
+            }
+            return null;
+        }
+
+        List<String> buildings = taUserMapper.getBuildingIdsOf(userId, buildingId);
+        return null == buildings || buildings.size() == 0 ? unAuthrized : buildings;
+    }
+
     @Override
-    public IPage<TsConsultantKpi> stsKPIDaily(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, String startDate, String endDate, String asc, String desc) {
+    public IPage<TsConsultantKpi> stsKPIDaily(Integer pageNum, Integer pageSize, Integer orgId, Integer userId, String buildingId, String startDate, String endDate, String asc, String desc) {
         if (StringUtils.isEmpty(asc) && StringUtils.isEmpty(desc)) {
             desc = "new_persons";
         }
 
+        List<String> buildingIds =  getBuildingListOf(userId, buildingId);
         IPage<TsConsultantKpi> page = new Page<>(pageNum, pageSize);
-        return tsConsultantKpiMapper.stsKPIDaily(page, orgId, buildingId, startDate, endDate, asc, desc);
+        return tsConsultantKpiMapper.stsKPIDaily(page, orgId, buildingIds, startDate, endDate, asc, desc);
     }
 
     @Override
-    public TsConsultantKpi stsKPITotalByOrg(Integer orgId, String buildingId, String startDate, String endDate) {
+    public TsConsultantKpi stsKPITotalByOrg(Integer orgId, Integer userId, String buildingId, String startDate, String endDate) {
+        List<String> buildingIds =  getBuildingListOf(userId, buildingId);
+
         // 合计数据, 但是不包含 客户总计 列
-        TsConsultantKpi result = tsConsultantKpiMapper.stsKPITotalByOrg(orgId, buildingId, startDate, endDate);
+        TsConsultantKpi result = tsConsultantKpiMapper.stsKPITotalByOrg(orgId, buildingIds, startDate, endDate);
 
         // 统计当前时间段内的已经固化的置业的客户
-        Integer totalPersons = tsConsultantKpiMapper.stsAllCustomersByOrg(orgId, buildingId, startDate, endDate);
+        Integer totalPersons = tsConsultantKpiMapper.stsAllCustomersByOrg(orgId, buildingIds, startDate, endDate);
         result.setTotalPersons(totalPersons);
 
         return result;
     }
 
     @Override
-    public List<ConsultantKPIExport> stsKPIDailyExport(Integer orgId, String buildingId, String startDate, String endDate) {
-        return tsConsultantKpiMapper.stsKPIDailyExport(orgId, buildingId, startDate, endDate);
+    public List<ConsultantKPIExport> stsKPIDailyExport(Integer orgId, Integer userId, String buildingId, String startDate, String endDate) {
+        List<String> buildingIds =  getBuildingListOf(userId, buildingId);
+        return tsConsultantKpiMapper.stsKPIDailyExport(orgId, buildingIds, startDate, endDate);
     }
 
     @Override

src/main/resources/application-blue.yml

@@ -6,7 +6,7 @@ spring:
   datasource:
     username: root
     password: LUfZGvh7j1^qA*2c
-    url: jdbc:mysql://123.57.65.31:3306/estateagents_20200417?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://123.57.65.31:3306/estateagents_test?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.cj.jdbc.Driver
     initial-size: 10 # 初始化连接数
     max-active: 20 # 最大连接数

src/main/resources/mapper/TaBuildingMapper.xml

@@ -237,6 +237,7 @@
 
     <select id="selectMainBuildings" resultType="com.huiju.estateagents.entity.TaBuilding">
         SELECT
+            CONCAT( c.`name`, t.building_area  ) AS building_area,
             t.*,
             s.url AS list_poster,
             GROUP_CONCAT( m.tag_name ) AS tags
@@ -245,6 +246,7 @@
         LEFT JOIN ta_building_img s ON t.building_id = s.building_id
         AND s.img_type = 'list'
         LEFT JOIN ta_building_tag m ON t.building_id = m.building_id
+        LEFT JOIN td_city c ON t.city_id = c.id
         WHERE
             t.org_id = #{orgId}
         <if test="cityId != null and cityId != ''">
@@ -374,7 +376,7 @@
         WHERE
             t.org_id = #{orgId}
         <if test="personBuildingList != null and personBuildingList.size > 0">
-            AND a.be_uv in
+            AND t.building_id in
             <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
                 #{personBuilding.buildingId}
             </foreach>

src/main/resources/mapper/TaPersonMapper.xml

@@ -628,7 +628,7 @@ FROM
                 b.lat,
                 t.person_id
             FROM
-            ( SELECT * FROM ta_person_position ORDER BY create_time DESC ) t
+            ( SELECT * FROM ta_person_position ORDER BY create_time asc ) t
                 LEFT JOIN ta_person a ON t.person_id = a.person_id
                 INNER JOIN td_city b ON t.citycode = b.citycode
             WHERE

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -432,5 +432,15 @@
             t.target_id, t.event_type;
     </select>
 
+    <select id="selectTodayVisitCount" resultType="java.lang.Integer">
+        SELECT
+        COUNT(1) as visit_count
+        FROM
+        ta_person_visit_record tp
+        where tp.org_id = #{orgId} AND
+        tp.event  = 'start'
+        AND DATE_FORMAT(tp.visit_time,'%Y-%m-%d') = DATE_FORMAT(#{nowDate},'%Y-%m-%d')
+    </select>
+
 
 </mapper>

src/main/resources/mapper/TaUserMapper.xml

@@ -125,4 +125,12 @@
         AND m.is_admin = 1
     </select>
 
+    <select id="getBuildingIdsOf" resultType="java.lang.String">
+        select building_id from ta_person_building
+        where user_id = #{userId}
+        <if test="buildingId != null and buildingId != ''">
+            and building_id != #{buildingId}
+        </if>
+    </select>
+
 </mapper>

src/main/resources/mapper/TsConsultantKpiMapper.xml

@@ -31,8 +31,12 @@
             WHERE
                 t.org_id = #{orgId}
                 AND t.statis_date BETWEEN #{startDate} AND #{endDate}
-            <if test="buildingId != null and buildingId != ''">
-                AND t.building_id = #{buildingId}
+            <if test="buildingIds != null">
+                AND t.building_id in
+                <foreach item="buildingId" index="index" collection="buildingIds"
+                         open="(" separator="," close=")">
+                    #{buildingId}
+                </foreach>
             </if>
             GROUP BY
                 t.user_id,
@@ -74,8 +78,12 @@
         WHERE
             t.org_id = #{orgId}
             AND t.statis_date BETWEEN #{startDate} AND #{endDate}
-        <if test="buildingId != null and buildingId != ''">
-            AND t.building_id = #{buildingId}
+        <if test="buildingIds != null">
+            AND t.building_id in
+            <foreach item="buildingId" index="index" collection="buildingIds"
+                     open="(" separator="," close=")">
+                #{buildingId}
+            </foreach>
         </if>
     </select>
 
@@ -107,9 +115,13 @@
         WHERE
             t.org_id = #{orgId}
         AND t.statis_date BETWEEN #{startDate} AND #{endDate}
-        <if test="buildingId != null and buildingId != ''">
-            AND t.building_id = #{buildingId}
-        </if>
+    <if test="buildingIds != null">
+        AND t.building_id in
+        <foreach item="buildingId" index="index" collection="buildingIds"
+                 open="(" separator="," close=")">
+            #{buildingId}
+        </foreach>
+    </if>
         GROUP BY
             t.user_id,
             t.building_id
@@ -130,8 +142,12 @@
             p.org_id = #{orgId}
             AND p.`status` > 0
             AND t.statis_date BETWEEN #{startDate} AND #{endDate}
-        <if test="buildingId != null and buildingId != ''">
-            AND t.building_id = #{buildingId}
+        <if test="buildingIds != null">
+            AND t.building_id in
+            <foreach item="buildingId" index="index" collection="buildingIds"
+                     open="(" separator="," close=")">
+                #{buildingId}
+            </foreach>
         </if>
     </select>