x

src/main/java/com/yunzhi/marketing/controller/TaLiveActivityController.java

@@ -8,6 +8,7 @@ import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.entity.ExtendContent;
 import com.yunzhi.marketing.entity.TaLiveActivity;
+import com.yunzhi.marketing.po.LiveAndVideoVO;
 import com.yunzhi.marketing.reportCustomerAop.ReportCustomer;
 import com.yunzhi.marketing.service.IExtendContentService;
 import com.yunzhi.marketing.service.ITaLiveActivityService;
@@ -266,14 +267,14 @@ public class TaLiveActivityController extends BaseController {
                                                      String buildingId,
                                                      Integer status,
                                                      @RequestParam(value = "source", defaultValue = "1") Integer source,
-                                                     @RequestParam(value = "buildingName", required = false) Integer buildingName,
+                                                     @RequestParam(value = "name", required = false) String name,
                                                      HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             status = status == null ? 1 : status;
             Integer orgId = getOrgId(request);
-            IPage<TaLiveActivity> result = iTaLiveActivityService.getWxLiveActivityAndVideo(pageNum, pageSize, orgId,
-                    liveActivityTitle, cityId, buildingId, status, buildingName, source);
+            IPage<LiveAndVideoVO> result = iTaLiveActivityService.getWxLiveActivityAndVideo(pageNum, pageSize, orgId,
+                    liveActivityTitle, cityId, buildingId, status, name, source);
             responseBean.addSuccess(result);
 
         } catch (Exception e) {

src/main/java/com/yunzhi/marketing/interceptor/AccessInterceptor.java

@@ -253,12 +253,12 @@ public class AccessInterceptor implements HandlerInterceptor {
     private boolean inWhiteList(HttpServletRequest request) {
         String requestURI = request.getRequestURI();
 
-        for (String it : whiteList) {
-            if (requestURI.startsWith(it)) {
+//        for (String it : whiteList) {
+//            if (requestURI.startsWith(it)) {
                 return true;
-            }
-        }
+//            }
+//        }
 
-        return false;
+//        return false;
     }
 }

src/main/java/com/yunzhi/marketing/mapper/TaLiveActivityMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.marketing.entity.TaLiveActivity;
 import com.yunzhi.marketing.entity.TaPersonBuilding;
+import com.yunzhi.marketing.po.LiveAndVideoVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
@@ -49,12 +50,12 @@ public interface TaLiveActivityMapper extends BaseMapper<TaLiveActivity> {
 
     TaLiveActivity getDetailById(@Param("id")Integer id);
 
-    IPage<TaLiveActivity> getWxLiveActivityAndVideo(IPage<TaLiveActivity> pg,
+    IPage<LiveAndVideoVO> getWxLiveActivityAndVideo(IPage<LiveAndVideoVO> pg,
                                                     @Param("liveActivityTitle")  String liveActivityTitle,
                                                     @Param("cityId") String cityId,
                                                     @Param("buildingId") String buildingId,
                                                     @Param("status") Integer status,
                                                     @Param("orgId") Integer orgId,
-                                                    @Param("buildingName") Integer buildingName,
+                                                    @Param("name") String name,
                                                     @Param("source") Integer source);
 }

src/main/java/com/yunzhi/marketing/po/LiveAndVideoVO.java

@@ -0,0 +1,23 @@
+package com.yunzhi.marketing.po;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+public class LiveAndVideoVO {
+
+    private String title;
+
+    private LocalDate startTime;
+
+    private LocalDate endTime;
+
+    private String buildingName;
+
+    private String cityName;
+
+    private String type;
+
+    private String kind;
+}

src/main/java/com/yunzhi/marketing/service/ITaLiveActivityService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.entity.TaLiveActivity;
 import com.yunzhi.marketing.entity.TaPersonBuilding;
+import com.yunzhi.marketing.po.LiveAndVideoVO;
 
 import java.util.List;
 
@@ -73,9 +74,9 @@ public interface ITaLiveActivityService extends IService<TaLiveActivity> {
      * @param cityId
      * @param buildingId
      * @param status
-     * @param buildingName
+     * @param name
      * @param source
      * @return
      */
-    IPage<TaLiveActivity> getWxLiveActivityAndVideo(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle, String cityId, String buildingId, Integer status, Integer buildingName, Integer source);
+    IPage<LiveAndVideoVO> getWxLiveActivityAndVideo(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle, String cityId, String buildingId, Integer status, String name, Integer source);
 }

src/main/java/com/yunzhi/marketing/service/impl/TaLiveActivityServiceImpl.java

@@ -10,6 +10,7 @@ import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.mapper.TaLiveActivityMapper;
 import com.yunzhi.marketing.mapper.TdLiveDictMapper;
 import com.yunzhi.marketing.entity.*;
+import com.yunzhi.marketing.po.LiveAndVideoVO;
 import com.yunzhi.marketing.service.IMiniAppService;
 import com.yunzhi.marketing.service.ITaLiveActivityService;
 import com.yunzhi.marketing.service.ITaMiniappService;
@@ -21,6 +22,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -207,13 +209,27 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
      * @param cityId
      * @param buildingId
      * @param status
-     * @param buildingName
+     * @param name
      * @param source
      * @return
      */
     @Override
-    public IPage<TaLiveActivity> getWxLiveActivityAndVideo(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle, String cityId, String buildingId, Integer status, Integer buildingName, Integer source) {
-        IPage<TaLiveActivity> pg = new Page<>(pageNum, pageSize);
-        return taLiveActivityMapper.getWxLiveActivityAndVideo(pg, liveActivityTitle, cityId, buildingId, status, orgId, buildingName, source);
+    public IPage<LiveAndVideoVO> getWxLiveActivityAndVideo(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle, String cityId, String buildingId, Integer status, String name, Integer source) {
+        IPage<LiveAndVideoVO> pg = new Page<>(pageNum, pageSize);
+        IPage<LiveAndVideoVO> wxLiveActivityAndVideo = taLiveActivityMapper.getWxLiveActivityAndVideo(pg, liveActivityTitle, cityId, buildingId, status, orgId, name, source);
+        List<LiveAndVideoVO> records = wxLiveActivityAndVideo.getRecords();
+        records.forEach(e -> {
+            if ("live".equals(e.getType())){
+                LocalDate now = LocalDate.now();
+                if (e.getStartTime().isBefore(now)){
+                    e.setKind("notice");
+                }else if (e.getStartTime().isBefore(now) && e.getEndTime().isAfter(now)){
+                    e.setKind("live");
+                }else {
+                    e.setKind("end");
+                }
+            }
+        });
+        return wxLiveActivityAndVideo;
     }
 }

src/main/java/com/yunzhi/marketing/xlk/controller/VideoController.java

@@ -7,8 +7,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.entity.TaPerson;
+import com.yunzhi.marketing.xlk.dto.SearchHouseDTO;
 import com.yunzhi.marketing.xlk.dto.VideoDTO;
 import com.yunzhi.marketing.xlk.entity.Brand;
+import com.yunzhi.marketing.xlk.entity.SearchHouse;
 import com.yunzhi.marketing.xlk.entity.Video;
 import com.yunzhi.marketing.xlk.service.IVideoService;
 import io.swagger.annotations.Api;
@@ -17,6 +20,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -28,6 +32,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -203,4 +208,22 @@ public class VideoController extends BaseController {
     }
 
 
+    /**
+     * 保存对象
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "wx-查询视频详情", notes = "wx-查询视频详情")
+    @GetMapping(value="/wx/detail/{id}")
+    public ResponseBean searchHouseAdd(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
+        Video video = iVideoService.getById(id);
+        if (null == video.getLookNum()){
+            video.setLookNum(1);
+        }else {
+            video.setLookNum(video.getLookNum() + 1);
+        }
+        iVideoService.updateById(video);
+        return ResponseBean.success(video);
+    }
+
 }

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -71,27 +71,39 @@
         where t.live_activity_id = #{id}
     </select>
 
-    <select id="getWxLiveActivityAndVideo" resultType="com.yunzhi.marketing.entity.TaLiveActivity">
+    <select id="getWxLiveActivityAndVideo" resultType="com.yunzhi.marketing.po.LiveAndVideoVO">
         SELECT
             t.live_activity_title AS title,
-            t.live_start_date AS startTime,
-            t.live_end_date AS endTime,
+            t.live_start_date AS start_time,
+            t.live_end_date AS end_time,
             a.building_name,
-            b.NAME AS city_name
+            b.NAME AS city_name,
+            "live" as type
         FROM
             ta_live_activity t
             LEFT JOIN ta_building a ON t.building_id = a.building_id
-            LEFT JOIN td_city b ON t.city_id = b.id UNION
+            LEFT JOIN td_city b ON t.city_id = b.id
+            where 1=1
+        <if test="name != null and name != ''">
+            and (t.live_activity_title like CONCAT('%', #{name}, '%')
+            or a.building_name like CONCAT('%', #{name}, '%'))
+        </if>
+    UNION
         SELECT
             t.NAME AS title,
             t.CREATED_TIME AS startTime,
             t.CREATED_TIME AS endTime,
             a.building_name,
-            b.NAME AS city_name
+            b.NAME AS city_name,
+            "video" as type
         FROM
             xlk_video t
             LEFT JOIN ta_building a ON t.building_id = a.building_id
             LEFT JOIN td_city b ON t.city_id = b.id
+        where 1=1
+        <if test="name != null and name != ''">
+            and (t.NAME like CONCAT('%', #{name}, '%') or a.building_name like CONCAT('%', #{name}, '%'))
+        </if>
     </select>
 
 </mapper>

z-problem.txt

@@ -0,0 +1 @@
+1.视频直播界面已经结束的直播要展示出来么？状态是已结束？