新增用戶數據表調整

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

@@ -150,41 +150,4 @@ public class TaPersonFromRecordController extends BaseController {
         return responseBean;
     }
 
-    /**
-     * 保存对象--新增用户数据记录
-     *
-     * @return
-     */
-    @RequestMapping(value="/wx/taPersonFromRecord",method= RequestMethod.POST)
-    public ResponseBean taPersonVisitRecordAdd(@RequestBody TaPersonFromRecord taPersonFromRecord, HttpServletRequest request){
-        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(getOpenId(request));
-        if (null == taPersons || taPersons.size() != 1) {
-            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-        }
-        TaPerson person = taPersons.get(0);
-        taPersonFromRecord.setActivity(taPersonFromRecord.getPropertyName());
-        taPersonFromRecord.setOrgId(getOrgId(request));
-        taPersonFromRecord.setPersonId(person.getPersonId());
-        taPersonFromRecord.setCreateDate(LocalDateTime.now());
-        QueryWrapper<TaPersonFromRecord> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("org_id",person.getOrgId());
-        queryWrapper.eq("person_id",person.getPersonId());
-        int count = iTaPersonFromRecordService.count(queryWrapper);
-        if(count > 0){
-            taPersonFromRecord.setIsFirstTime(false);
-        }else {
-            taPersonFromRecord.setIsFirstTime(true);
-        }
-        try {
-            if (iTaPersonFromRecordService.save(taPersonFromRecord)){
-                return ResponseBean.success(taPersonFromRecord);
-            }else {
-                return ResponseBean.error("保存失败",ResponseBean.ERROR_UNAVAILABLE);
-            }
-        }catch (Exception e){
-            logger.error("taPersonFromRecordAdd -=- {}",e.toString());
-            return ResponseBean.error("系统异常"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
 }

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

@@ -53,7 +53,8 @@ public class TaPersonVisitRecordController extends BaseController {
     public ITaBuildingService buildingService;
     @Autowired
     private ITaRecommendCustomerService taRecommendCustomerService;
-
+    @Autowired
+    public ITaPersonFromRecordService iTaPersonFromRecordService;
 
 
     /**
@@ -141,6 +142,8 @@ public class TaPersonVisitRecordController extends BaseController {
         }
         try {
             if (iTaPersonVisitRecordService.save(taPersonVisitRecord)){
+                //清洗埋點數據到新增用戶表
+                iTaPersonFromRecordService.addNewPersonRecordRecord(taPersonVisitRecord);
                 return ResponseBean.success(taPersonVisitRecord);
             }else {
                 return ResponseBean.error("保存失败",ResponseBean.ERROR_UNAVAILABLE);

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

@@ -46,11 +46,6 @@ public class TaPersonFromRecord implements Serializable {
      */
     private Boolean isFirstTime;
 
-    /**
-     * 类型
-     */
-    private String targetType;
-
     /**
      * 类型ID值
      */
@@ -90,7 +85,4 @@ public class TaPersonFromRecord implements Serializable {
      * 行为
      */
     private String activity;
-
-    @TableField(exist = false)
-    private String propertyName;
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaPersonFromRecord;
+import com.huiju.estateagents.entity.TaPersonVisitRecord;
 
 /**
  * <p>
@@ -13,4 +14,5 @@ import com.huiju.estateagents.entity.TaPersonFromRecord;
  */
 public interface ITaPersonFromRecordService extends IService<TaPersonFromRecord> {
 
+    void addNewPersonRecordRecord(TaPersonVisitRecord taPersonVisitRecord);
 }

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

@@ -1,11 +1,16 @@
 package com.huiju.estateagents.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.entity.TaPersonFromRecord;
+import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.mapper.TaPersonFromRecordMapper;
 import com.huiju.estateagents.service.ITaPersonFromRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 新增用户来源表  服务实现类
@@ -17,4 +22,35 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaPersonFromRecordServiceImpl extends ServiceImpl<TaPersonFromRecordMapper, TaPersonFromRecord> implements ITaPersonFromRecordService {
 
+    @Autowired
+    private TaPersonFromRecordMapper taPersonFromRecordMapper;
+
+    /**
+     * 通過買點表清洗數據
+     * @param taPersonVisitRecord
+     */
+    @Override
+    public void addNewPersonRecordRecord(TaPersonVisitRecord taPersonVisitRecord) {
+        TaPersonFromRecord taPersonFromRecord = new TaPersonFromRecord();
+        taPersonFromRecord.setCreateDate(LocalDateTime.now());
+        taPersonFromRecord.setActivity(taPersonVisitRecord.getActivity());
+        taPersonFromRecord.setOrgId(Integer.valueOf(taPersonVisitRecord.getOrgId()));
+        taPersonFromRecord.setPersonId(taPersonVisitRecord.getPersonId());
+        taPersonFromRecord.setBuildingId(taPersonVisitRecord.getBuildingId());
+        taPersonFromRecord.setEvent(taPersonVisitRecord.getEvent());
+        taPersonFromRecord.setEventType(taPersonVisitRecord.getEventType());
+        taPersonFromRecord.setSceneId(taPersonVisitRecord.getSceneId());
+        taPersonFromRecord.setSharePersonId(taPersonVisitRecord.getSharePersonId());
+        taPersonFromRecord.setTargetId(taPersonVisitRecord.getTargetId());
+        QueryWrapper<TaPersonFromRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id",taPersonVisitRecord.getOrgId());
+        queryWrapper.eq("person_id",taPersonVisitRecord.getPersonId());
+        int count = taPersonFromRecordMapper.selectCount(queryWrapper);
+        if(count > 0){
+            taPersonFromRecord.setIsFirstTime(false);
+        }else {
+            taPersonFromRecord.setIsFirstTime(true);
+        }
+        taPersonFromRecordMapper.insert(taPersonFromRecord);
+    }
 }