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

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

@@ -85,12 +85,8 @@ public class TaPersonVisitRecordController extends BaseController {
         }
         TaPerson person = taPersons.get(0);
         taPersonVisitRecord.setActivity(taPersonVisitRecord.getPropertyName());
-        QueryWrapper<TaEventProperties>event = new QueryWrapper<>();
-        event.eq("target_id",taPersonVisitRecord.getTargetId());
-        event.eq("event_type",taPersonVisitRecord.getEventType());
-        event.eq("property_code",taPersonVisitRecord.getActivity());
-        List<TaEventProperties> eventProperties = taEventPropertiesService.list(event);
-        if(eventProperties.size()<=0){
+        Integer eventProperties = taEventPropertiesService.isEventExist(taPersonVisitRecord.getTargetId(),taPersonVisitRecord.getEventType(),taPersonVisitRecord.getActivity());
+        if(eventProperties<=0){
             TaEventProperties taEventProperty = new TaEventProperties();
             taEventProperty.setBuildingId(taPersonVisitRecord.getTargetId());
             taEventProperty.setCreateDate(LocalDateTime.now());

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

@@ -4,6 +4,7 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaEventProperties;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -16,4 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaEventPropertiesMapper extends BaseMapper<TaEventProperties> {
 
+    Integer isEventExist(@Param("targetId") String targetId, @Param("eventType") String eventType, @Param("activity") String activity);
+
 }

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

@@ -49,4 +49,6 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
     @Select("select * from ta_person_visit_record where event = #{event} and person_id = #{personId}")
     List<TaPersonVisitRecord> selectEventAll(@Param("event") String event, @Param("personId") String personId);
 
+
+
 }

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

@@ -14,4 +14,6 @@ import com.huiju.estateagents.entity.TaEventProperties;
  */
 public interface ITaEventPropertiesService extends IService<TaEventProperties> {
 
+    Integer isEventExist(String targetId,String eventType,String activity);
+
 }

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

@@ -16,5 +16,9 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TaEventPropertiesServiceImpl extends ServiceImpl<TaEventPropertiesMapper, TaEventProperties> implements ITaEventPropertiesService {
+    @Override
+    public Integer isEventExist(String targetId,String eventType,String activity){
+        return 1;
+    }
 
 }

src/main/resources/mapper/TaEventPropertiesMapper.xml

@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaEventPropertiesMapper">
+    <select id="isEventExist" resultType="java.lang.Integer">
+        SELECT
+	COUNT(1)
+FROM
+	ta_event_properties t
+WHERE
+	( ( t.target_id IS NULL AND #{targetId} IS NULL ) OR t.target_id	= #{targetId} )
+	AND ( ( t.event_type IS NULL AND #{eventType} IS NULL ) OR t.event_type = #{eventType} )
+	AND ( ( t.property_code IS NULL AND #{propertyCode} IS NULL ) OR t.property_code = #{propertyCode} )
+    </select>
 
 </mapper>