数据库迁移

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -335,9 +335,11 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		Integer status = isOn ? CommConstant.STATUS_NORMAL : CommConstant.STATUS_CLOSED;
 		TaUser user = new TaUser();
 		user.setStatus(status);
-		user.setUserId(id);
 
-		if (!this.updateById(user)) {
+		QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+		taUserQueryWrapper.eq("org_id", taUserMapper.selectById(id).getOrgId());
+
+		if (!this.update(user, taUserQueryWrapper)) {
 			throw new Exception("开启或禁用用户失败");
 		}
 	}

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

@@ -556,4 +556,25 @@ public class CommConstant {
      * 登录中心端系统类型
      */
     public static final String LOGIN_TYPE_CENTER = "center";
+
+    /**
+     * 查看分享者活动类型 h5
+     */
+    public static final String H5_SHARE = "h5_share";
+
+    /**
+     * 查看分享者活动类型 拼团
+     */
+    public static final String GROUP_SHARE = "group_share";
+
+    /**
+     * 查看分享者活动类型 助力
+     */
+    public static final String HELP_SHARE = "help_share";
+
+    /**
+     * 查看分享者活动类型 活动
+     */
+    public static final String DYNAMIC_SHARE = "dynamic_share";
+
 }

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

@@ -132,29 +132,31 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 				e.setUserTel(personInfo.getPhone());
 			}
 
-			TaPerson userShareInfo = taPersonMapper.selectById(e.getPersonId());
+			QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("user_id", e.getSharePersonId()).or().eq("person_id", e.getSharePersonId());
+			TaPerson userShareInfo = taPersonMapper.selectOne(queryWrapper);
 			if (userShareInfo != null) {
 				e.setShareName(userShareInfo.getNickname());
 				e.setShareTel(userShareInfo.getPhone());
 			}
 
-			if (CommConstant.EVENT_H5.equals(e.getEventType())) {
+			if (CommConstant.H5_SHARE.equals(e.getEventType())) {
 				e.setActivityName(e.getDrainageName());
 				continue;
 			}
-			if (CommConstant.POSTER_CONTENT_TYPE_BUILDING.equals(e.getEventType())) {
+			if (CommConstant.BUILDING_SHARE.equals(e.getEventType())) {
 				e.setActivityName(e.getBuildingName());
 				continue;
 			}
-			if (CommConstant.POSTER_CONTENT_TYPE_NEWS.equals(e.getEventType())) {
+			if (CommConstant.NEWS_SHARE.equals(e.getEventType())) {
 				e.setActivityName(e.getNewsName());
 				continue;
 			}
-			if (CommConstant.POINTS_CHANGE_HELP.equals(e.getEventType())) {
+			if (CommConstant.HELP_SHARE.equals(e.getEventType())) {
 				e.setActivityName(e.getHelpActivityName());
 				continue;
 			}
-			if (CommConstant.POINTS_CHANGE_GROUP.equals(e.getEventType())) {
+			if (CommConstant.GROUP_SHARE.equals(e.getEventType())) {
 				e.setActivityName(e.getGroupActivityName());
 				continue;
 			}

src/main/resources/application-blue.yml

@@ -4,9 +4,9 @@ spring:
   application:
     name: estateagents
   datasource:
-    username: estateagents
-    password: estateagents
-    url: jdbc:mysql://47.101.36.130:3306/estateagents_3.5.1_test?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    username: root
+    password: LUfZGvh7j1^qA*2c
+    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/application-green.yml

@@ -4,9 +4,9 @@ spring:
   application:
     name: estateagents
   datasource:
-    username: estateagents
-    password: estateagents
-    url: jdbc:mysql://47.101.36.130:3306/estateagents_3.5.1_test?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    username: root
+    password: LUfZGvh7j1^qA*2c
+    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/application-prod-blue.yml

@@ -4,9 +4,9 @@ spring:
   application:
     name: estateagents
   datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents3.5?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    username: root
+    password: HZjVK5O%zTdP0#8AhGcF@03!eZsGbqdO
+    url: jdbc:mysql://rm-2zez52se79qgg9649po.mysql.rds.aliyuncs.com:3306/estateagents3.5?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 # 最大连接数

src/main/resources/application-prod-green.yml

@@ -4,9 +4,9 @@ spring:
   application:
     name: estateagents
   datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents3.5?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    username: root
+    password: HZjVK5O%zTdP0#8AhGcF@03!eZsGbqdO
+    url: jdbc:mysql://rm-2zez52se79qgg9649po.mysql.rds.aliyuncs.com:3306/estateagents3.5?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 # 最大连接数

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -155,12 +155,12 @@
     <select id="getDrainageVisitRecord" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
         select * from (
             select
-<!--            <include refid="columnSql"></include>,-->
+            t.share_person as share_person_id,
             t.person_id,
             c.person_type,
             t.create_date as visit_time,
-            t.tagert_type as event_type,
-            t.be_share as target_id,
+            t.target_type as event_type,
+            t.target_id as target_id,
             b.name as drainageName,
             d.building_name as buildingName,
             tn.news_name as newsName,
@@ -168,26 +168,26 @@
             tsa.activity_name as groupActivityName,
             tbd.title as activityName,
             b.drainage_id
-            from ta_share t
-            left join ta_drainage b on t.be_share = b.drainage_id
-            left join ta_building d on t.be_share = d.building_id
-            left join ta_news tn on t.be_share = tn.news_id
-            left join ta_help_activity tha on t.be_share = tha.help_activity_id
-            left join ta_share_activity tsa on t.be_share = tsa.group_activity_id
-            left join ta_building_dynamic tbd on t.be_share = tbd.dynamic_id
-            left join ta_person c on t.person_id = c.person_id
+            from ta_share_person_from t
+            left join ta_drainage b on t.target_id = b.drainage_id
+            left join ta_building d on t.target_id = d.building_id
+            left join ta_news tn on t.target_id = tn.news_id
+            left join ta_help_activity tha on t.target_id = tha.help_activity_id
+            left join ta_share_activity tsa on t.target_id = tsa.group_activity_id
+            left join ta_building_dynamic tbd on t.target_id = tbd.dynamic_id
+            left join ta_person c on (t.share_person = c.person_id or t.share_person = c.user_id)
             where 1=1
-                and t.tagert_type != 'consultant'
+            and t.target_type in ('h5_share','group_share','help_share','news_share','dynamic_share','building_share')
             <if test="orgId != null and orgId != ''">
                 and c.org_id = #{orgId}
             </if>
             <if test="eventType !=null and eventType != ''">
-                and t.tagert_type = #{eventType}
+                and t.target_type = #{eventType}
             </if>
             <if test="activityName !=null and activityName != ''">
                 and (
-                (b.name like concat('%',#{activityName},'%') and t.tagert_type = 'h5')or (d.name like concat('%',#{activityName},'%') and t.tagert_type = 'building') or (tn.news_name like concat('%',#{activityName},'%') and t.tagert_type = 'news')
-                or (tha.title like concat( '%', #{activityName}, '%' ) and t.tagert_type = 'help')  or (tsa.activity_name like concat('%',#{activityName},'%') and t.tagert_type = 'group') or (tbd.title like concat('%',#{activityName},'%') and t.tagert_type = 'activity')
+                (b.name like concat('%',#{activityName},'%') and t.target_type = 'h5_share')or (d.name like concat('%',#{activityName},'%') and t.target_type = 'building_share') or (tn.news_name like concat('%',#{activityName},'%') and t.target_type = 'news_share')
+                or (tha.title like concat( '%', #{activityName}, '%' ) and t.target_type = 'help_share')  or (tsa.activity_name like concat('%',#{activityName},'%') and t.target_type = 'group_share') or (tbd.title like concat('%',#{activityName},'%') and t.target_type = 'dynamic_share')
                 )
             </if>
             <if test="shareName !=null and shareName != ''">
@@ -213,7 +213,7 @@
             </if>
             order by t.create_date desc
         ) t
-        group by t.person_id, t.target_id,t.event_type
+        group by t.person_id, t.target_id,t.event_type, t.share_person_id
         order by t.visit_time desc
     </select>