傅行帆 před 5 roky
rodič
revize
1674e719f7

+ 7
- 0
src/main/java/com/huiju/estateagents/common/CommConstant.java Zobrazit soubor

@@ -552,6 +552,13 @@ public class CommConstant {
552 552
      */
553 553
     public static final String HOUSE = "house";
554 554
 
555
+
556
+    /**
557
+     * 首页分享
558
+     */
559
+    public static final String INDEX = "index";
560
+
561
+
555 562
     /**
556 563
      * 批量销售
557 564
      */

+ 1
- 1
src/main/java/com/huiju/estateagents/common/StringUtils.java Zobrazit soubor

@@ -26,7 +26,7 @@ public class StringUtils {
26 26
     }
27 27
 
28 28
     public static String ifNull(String src, String defaultVal) {
29
-        return null == src || "".equals(src) ? defaultVal : src;
29
+        return isEmpty(src) ? defaultVal : src;
30 30
     }
31 31
 
32 32
     public static String random(int length) {

+ 15
- 6
src/main/java/com/huiju/estateagents/controller/IndexController.java Zobrazit soubor

@@ -1,19 +1,28 @@
1 1
 package com.huiju.estateagents.controller;
2 2
 
3
-import org.springframework.web.bind.annotation.RequestMapping;
4
-import org.springframework.web.bind.annotation.RestController;
3
+import com.huiju.estateagents.base.ResponseBean;
4
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
5
+import org.springframework.web.bind.annotation.*;
6
+
7
+import javax.servlet.http.HttpServletRequest;
5 8
 
6 9
 /**
7 10
  * 微信首页
8 11
  */
9 12
 @RestController
10
-@RequestMapping("/api")
13
+@RequestMapping("/api/wx")
11 14
 public class IndexController {
12 15
 
13 16
 
14 17
 
15
-
16
-
17
-
18
+    @PostMapping("/indexCustomer")
19
+    @ReportCustomer(type = "index")
20
+    public ResponseBean getPreloadData(@RequestParam(value = "id", required = false) String id,
21
+                                       @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
22
+                                       @RequestParam(value = "channelId", required = false) String channelId,
23
+                                       @RequestParam(value = "sceneId", required = false) String sceneId,
24
+                                       HttpServletRequest request) {
25
+        return ResponseBean.success("success");
26
+    }
18 27
 
19 28
 }

+ 19
- 21
src/main/java/com/huiju/estateagents/reportCustomerAop/ReportCustomerAspect.java Zobrazit soubor

@@ -1,23 +1,5 @@
1 1
 package com.huiju.estateagents.reportCustomerAop;
2 2
 
3
-import java.time.LocalDateTime;
4
-import java.util.List;
5
-import java.util.Map;
6
-
7
-import javax.servlet.http.HttpServletRequest;
8
-
9
-import com.alibaba.fastjson.JSONObject;
10
-import org.aspectj.lang.JoinPoint;
11
-import org.aspectj.lang.annotation.After;
12
-import org.aspectj.lang.annotation.Aspect;
13
-import org.aspectj.lang.annotation.Before;
14
-import org.aspectj.lang.annotation.Pointcut;
15
-import org.aspectj.lang.reflect.MethodSignature;
16
-import org.slf4j.Logger;
17
-import org.slf4j.LoggerFactory;
18
-import org.springframework.beans.factory.annotation.Autowired;
19
-import org.springframework.stereotype.Component;
20
-
21 3
 import com.huiju.estateagents.base.BaseController;
22 4
 import com.huiju.estateagents.base.ResponseBean;
23 5
 import com.huiju.estateagents.common.CommConstant;
@@ -28,6 +10,20 @@ import com.huiju.estateagents.entity.TaPerson;
28 10
 import com.huiju.estateagents.mapper.TaBuildingMapper;
29 11
 import com.huiju.estateagents.mapper.TaPersonMapper;
30 12
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
13
+import org.aspectj.lang.JoinPoint;
14
+import org.aspectj.lang.annotation.After;
15
+import org.aspectj.lang.annotation.Aspect;
16
+import org.aspectj.lang.annotation.Pointcut;
17
+import org.aspectj.lang.reflect.MethodSignature;
18
+import org.slf4j.Logger;
19
+import org.slf4j.LoggerFactory;
20
+import org.springframework.beans.factory.annotation.Autowired;
21
+import org.springframework.stereotype.Component;
22
+
23
+import javax.servlet.http.HttpServletRequest;
24
+import java.time.LocalDateTime;
25
+import java.util.List;
26
+import java.util.Map;
31 27
 
32 28
 @Aspect
33 29
 @Component
@@ -72,7 +68,7 @@ public class ReportCustomerAspect extends BaseController {
72 68
             HttpServletRequest request = (HttpServletRequest) args[4];
73 69
 
74 70
             Map<String, Object> stringObjectMap = getBuildingByIdAndType(targetId, targetType);
75
-            if (request == null) {
71
+            if (!CommConstant.INDEX.equals(targetType) && request == null) {
76 72
                 responseBean.addError("未授权,不进行操作");
77 73
                 return responseBean;
78 74
             }
@@ -86,14 +82,14 @@ public class ReportCustomerAspect extends BaseController {
86 82
             TaPerson taPerson = persons.get(0);
87 83
             Integer orgId = getOrgId(request);
88 84
 
89
-            TaCustomerFrom taCustomerFrom = assembleVO(taPerson, targetType, targetId, stringObjectMap.get("targetName").toString(), orgId, sceneId, channelId, qrCodeId);
85
+            TaCustomerFrom taCustomerFrom = assembleVO(taPerson, targetType, targetId, null == stringObjectMap ? null : stringObjectMap.get("targetName").toString(), orgId, StringUtils.ifNull(sceneId,null), channelId, qrCodeId);
90 86
             // 推广人
91 87
             TaPerson recPerson = StringUtils.isEmpty(recommend) ? null : taPersonMapper.getById(recommend);
92 88
             // 是否置业顾问
93 89
             boolean isConsultant = null != recPerson && CommConstant.PERSON_REALTY_CONSULTANT.equals(recPerson.getPersonType());
94 90
             TaPerson consultantInfo = null != consultantPersonId ? reportCustomerImpl.getPerson(consultantPersonId) : (isConsultant ? recPerson : null);
95 91
             // 推荐楼盘
96
-            TaBuilding taBuilding = (TaBuilding) stringObjectMap.get("taBuilding");
92
+            TaBuilding taBuilding = null == stringObjectMap ? null : (TaBuilding) stringObjectMap.get("taBuilding");
97 93
             TaBuilding building = taBuilding == null ? null : taBuildingMapper.selectById(taBuilding.getBuildingId());
98 94
 
99 95
             if (StringUtils.isEmpty(taPerson.getPhone())) {
@@ -161,6 +157,8 @@ public class ReportCustomerAspect extends BaseController {
161 157
             case CommConstant.HOUSE:
162 158
                 buildingAndNameInfo = reportCustomerImpl.selectHouseBuildingInfo(targetId);
163 159
                 break;
160
+            case CommConstant.INDEX:
161
+                break;
164 162
             default:
165 163
                 buildingAndNameInfo = reportCustomerImpl.selectBuildingInfo(targetId);
166 164
                 break;

+ 12
- 23
src/main/java/com/huiju/estateagents/reportCustomerAop/ReportCustomerImpl.java Zobrazit soubor

@@ -1,33 +1,17 @@
1 1
 package com.huiju.estateagents.reportCustomerAop;
2 2
 
3
-import java.util.HashMap;
4
-import java.util.Map;
5
-
6
-import org.springframework.beans.factory.annotation.Autowired;
7
-import org.springframework.stereotype.Service;
8
-
9 3
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
10 4
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
11 5
 import com.huiju.estateagents.drainage.entity.TaDrainage;
12 6
 import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
13
-import com.huiju.estateagents.entity.HelpActivity;
14
-import com.huiju.estateagents.entity.TaBuilding;
15
-import com.huiju.estateagents.entity.TaBuildingDynamic;
16
-import com.huiju.estateagents.entity.TaLiveActivity;
17
-import com.huiju.estateagents.entity.TaNews;
18
-import com.huiju.estateagents.entity.TaPerson;
19
-import com.huiju.estateagents.entity.TaSalesBatch;
20
-import com.huiju.estateagents.entity.TaShareActivity;
21
-import com.huiju.estateagents.mapper.HelpActivityMapper;
22
-import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
23
-import com.huiju.estateagents.mapper.TaBuildingMapper;
24
-import com.huiju.estateagents.mapper.TaLiveActivityMapper;
25
-import com.huiju.estateagents.mapper.TaNewsMapper;
26
-import com.huiju.estateagents.mapper.TaPersonMapper;
27
-import com.huiju.estateagents.mapper.TaSalesBatchMapper;
28
-import com.huiju.estateagents.mapper.TaShareActivityMapper;
29
-
7
+import com.huiju.estateagents.entity.*;
8
+import com.huiju.estateagents.mapper.*;
30 9
 import lombok.extern.slf4j.Slf4j;
10
+import org.springframework.beans.factory.annotation.Autowired;
11
+import org.springframework.stereotype.Service;
12
+
13
+import java.util.HashMap;
14
+import java.util.Map;
31 15
 
32 16
 @Slf4j
33 17
 @Service
@@ -177,4 +161,9 @@ public class ReportCustomerImpl extends ServiceImpl<TaPersonMapper, TaPerson> {
177 161
     public TaPerson getPerson(String personId){
178 162
         return getById(personId);
179 163
     }
164
+
165
+    public Map<String, Object> selectIndexInfo(String targetId) {
166
+        Map<String, Object> map = new HashMap<>();
167
+        return map;
168
+    }
180 169
 }