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

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaShareCount;
@@ -47,6 +48,11 @@ public class TaPersonBuildingServiceImpl extends ServiceImpl<TaPersonBuildingMap
         List<TaPersonBuilding> list = taPersonBuildingMapper.selectListByParams(page, orgId, buildingId, startCreateDate, endCreateDate, taPersonBuildingList);
         for (TaPersonBuilding taPersonBuilding : list) {
             QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+            if (StringUtils.isEmpty(taPersonBuilding.getPersonId())){
+                taPersonBuilding.setClickNum(0);
+                taPersonBuilding.setShareCount(0);
+                continue;
+            }
             taPersonQueryWrapper.eq("person_id", taPersonBuilding.getPersonId());
             TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
             taPersonBuilding.setShareCount(taShareCountMapper.countShare(taPersonBuilding.getPersonId(), orgId, startCreateDate, endCreateDate));

src/main/java/com/huiju/estateagents/websocket/ChatServer.java

@@ -51,7 +51,7 @@ public class ChatServer {
         removeSameFromSets(sid);
         this.session = session;
         webSocketSet.add(this);
-        addOnlineCount();
+//        addOnlineCount();
         this.sid=sid;
         log.info("有新窗口开始监听: "+sid+" ,当前在线人数为 " + getOnlineCount());
     }
@@ -71,7 +71,7 @@ public class ChatServer {
     @OnMessage
     public void onMessage(String message, Session session) {
         // 心跳
-        if ("ping" == message) {
+        if ("ping".equals(message)) {
             try {
                 this.sendMessage("pong");
             } catch (IOException e) {
@@ -119,7 +119,7 @@ public class ChatServer {
         for(ChatServer c: webSocketSet) {
             if (sid.equals(c.sid)) {
                 webSocketSet.remove(c);
-                subOnlineCount();
+//                subOnlineCount();
                 log.info("有一连接关闭:"+sid+"！当前在线人数为" + getOnlineCount());
             }
         }
@@ -129,7 +129,7 @@ public class ChatServer {
         for(ChatServer c: webSocketSet) {
             if (currentSid.equals(c.sid)) {
                 webSocketSet.remove(c);
-                subOnlineCount();
+//                subOnlineCount();
                 log.info("有一连接关闭:"+sid+"！当前在线人数为" + getOnlineCount());
             }
         }
@@ -166,16 +166,16 @@ public class ChatServer {
     }
 
     public static synchronized int getOnlineCount() {
-        return onlineCount;
+        return webSocketSet.size();
     }
 
-    public static synchronized void addOnlineCount() {
-        ChatServer.onlineCount++;
-    }
+//    public static synchronized void addOnlineCount() {
+//        ChatServer.onlineCount++;
+//    }
 
-    public static synchronized void subOnlineCount() {
-        ChatServer.onlineCount--;
-    }
+//    public static synchronized void subOnlineCount() {
+//        ChatServer.onlineCount--;
+//    }
 
     public static void setApplicationContext(ApplicationContext applicationContext) {
         ChatServer.applicationContext = applicationContext;

src/main/resources/application-gzysd.yml

@@ -1,3 +1,79 @@
+<<<<<<< HEAD
+server:
+  port: 8009
+spring:
+  application:
+    name: estateagents
+  datasource:
+    username: estateagents
+    password: DQ@0lW##kBb2+-jPZ
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_17?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    initial-size: 10 # 初始化连接数
+    max-active: 20 # 最大连接数
+    min-idle: 8 # 最小空闲数
+    max-idle: 8 # 最大空闲数
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 50MB
+
+##mybatis-plus
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    call-setters-on-nulls: true
+  mapper-locations: classpath:mapper/**/*.xml
+wx:
+  miniapp:
+    appid: wxe3b1e683853800b5
+    secret: 207dd6d0f807b2dd0d41b57a8184365f
+    token:
+    aesKey:
+    msgDataFormat: JSON
+  tpls:
+    - name: notice
+      id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
+      keywords: 4
+    - name: newCustomer
+      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
+      keywords: 4
+    - name: mainbiz
+      id: IywdSfNPegeg5GB3Q-TVieSYD9DA0im8eI-hF_u0i-4
+      keywords: 6
+ali:
+  accessKeyId: LTAIkc75dpkJw8Lb
+  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
+  oss:
+    endpoint: oss-cn-shanghai.aliyuncs.com
+    bucketName: estateagents
+    bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
+
+# 手机短信服务
+sms:
+  url: http://micservice.ycjcjy.com/sms
+  method: POST
+  contentType: "application/json;charset=UTF-8"
+  template:
+    code:
+    tel:
+    params:
+
+  # 以下为各模板 code
+  # 验证码
+  captcha:
+    # 模板 code
+    code: "0301"
+    # 有效时间 秒
+    expire: 120
+    # 验证码长度
+    size: 4
+    # 短信签名
+    sign: AI智慧案场
+
+  visitor:
+    code: "0501"
+=======
 server:
   port: 8009
 spring:
@@ -50,3 +126,4 @@ ali:
     bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
 
 
+>>>>>>> ac499f2ddc4d4469098e59fff8bbe310779f7be3

src/main/resources/mapper/TaPersonBuildingMapper.xml

@@ -3,12 +3,12 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaPersonBuildingMapper">
 
     <select id="selectListByParams" resultType="com.huiju.estateagents.entity.TaPersonBuilding">
-        select  a.building_id, t.user_name as consultantName, d.building_name, b.person_id From ta_user t
+        select  a.building_id, t.user_name as consultantName, d.building_name, b.person_id, t.user_id From ta_user t
         left join ta_person_building a on t.user_id = a.user_id
         left join ta_person b on t.user_id = b.user_id
         left join ta_share_count c on b.person_id = c.person_id
         LEFT JOIN ta_building d on a.building_id = d.building_id
-        where t.org_id = #{orgId}
+        where t.org_id = #{orgId} and t.is_consultant = 1
             <if test="buildingId != null and buildingId != ''">
               and a.building_id = #{buildingId}
             </if>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -613,11 +613,11 @@ FROM
         if(a.sex = 1, '男', if(a.sex = 2, '女', '未知')) as sex,
         CASE
         WHEN b.NAME IS NULL THEN
-        c.NAME ELSE b.NAME
+        d.user_name ELSE b.NAME
         END AS consultantName,
         CASE
         WHEN b.tel IS NULL THEN
-        c.tel ELSE b.tel
+        d.phone ELSE b.tel
         END AS consultTel,
         t.building_name
         FROM

src/main/resources/mapper/TaShareCountMapper.xml

@@ -31,7 +31,7 @@
         from ta_share_count t
         left join ta_building_dynamic a on t.be_share = a.dynamic_id and t.tagert_type = 'activity'
         left join ta_help_activity b on t.be_share = b.help_activity_id and t.tagert_type = 'help'
-        left join ta_share_activity c on t.be_share = c.share_id and t.tagert_type = 'group'
+        left join ta_share_activity c on t.be_share = c.group_activity_id and t.tagert_type = 'group'
         LEFT JOIN ta_drainage d on t.be_share = d.drainage_id and t.tagert_type = 'h5'
         left join ta_building e on t.be_share = e.building_id and t.tagert_type = 'project'
         LEFT JOIN ta_news f on t.be_share = f.news_id and t.tagert_type = 'news'
@@ -67,8 +67,8 @@
                 when a.`name` != null || a.`name` != '' then a.`name`
                 else '空'
                 end as shareTitle,
-                        a.phone as personPhone,
-                        a.nickName as personName,
+                        z.phone as personPhone,
+                        z.nickName as personName,
                         t.create_date
 
         FROM
@@ -81,7 +81,8 @@
                 left join ta_building e on t.target_id = e.building_id and t.target_type = 'building_share'
                 LEFT JOIN ta_news f on t.target_id = f.news_id and t.target_type = 'news_share'
 
-        LEFT JOIN ta_person a ON t.person_id = a.person_id and t.target_type = 'card_share'
+        LEFT JOIN ta_person a ON t.share_person = a.person_id or t.share_person = a.user_id
+        LEFT JOIN ta_person z ON t.person_id = z.person_id
         WHERE
             (t.share_person = (select user_id from ta_person where person_id = #{personId}) or t.share_person = #{personId})
         AND t.org_id = #{orgId}