feats

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

@@ -114,6 +114,9 @@ public class MiniAppController extends BaseController {
     @Autowired
     public TaChannelService taChannelService;
 
+    @Autowired
+    public ISysOrgParamsService iSysOrgParamsService;
+
     /**
      * 验证接入
      */
@@ -172,11 +175,17 @@ public class MiniAppController extends BaseController {
         queryExt.eq("status", CommConstant.STATUS_NORMAL);
         List<TaCustomImg> taCustomImg = iTaCustomImgService.list(queryExt);
 
+        // 获取系统参数
+        QueryWrapper<SysOrgParams> queryParams = new QueryWrapper<>();
+        queryParams.eq("org_id", taOrg.getOrgId());
+        List<SysOrgParams> sysParamsList = iSysOrgParamsService.list(queryParams);
+
         return ResponseBean.success(new HashMap<String, Object>() {{
             put("miniapp", taMiniapp);
             put("org", taOrg);
             put("cityList", taOrgCityList);
             put("customImg", taCustomImg);
+            put("sysParamsList", sysParamsList);
         }});
     }
 

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

@@ -10,13 +10,10 @@ import com.yunzhi.marketing.base.BaseController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * <p>
@@ -27,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2019-08-01
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class SysOrgParamsController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(SysOrgParamsController.class);
@@ -141,4 +138,20 @@ public class SysOrgParamsController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 小程序获取系统参数
+     * @param paramCode
+     * @param request
+     * @return
+     */
+    @GetMapping("/wx/sysOrgParams/{paramCode}")
+    public ResponseBean wxGetSysParams(@PathVariable String paramCode,
+                                       HttpServletRequest request) {
+        QueryWrapper<SysOrgParams> queryParams = new QueryWrapper<>();
+        queryParams.eq("org_id", getOrgId(request));
+        queryParams.eq("param_code", paramCode);
+        List<SysOrgParams> sysParamsList = iSysOrgParamsService.list(queryParams);
+        return ResponseBean.success(sysParamsList.get(0));
+    }
 }

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

@@ -2,6 +2,7 @@ package com.yunzhi.marketing.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+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.CommConstant;
@@ -262,19 +263,21 @@ public class TaLiveActivityController extends BaseController {
     @RequestMapping(value = "/wx/taLiveActivity", method = RequestMethod.GET)
     public ResponseBean taLiveActivityListForMiniApp(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                                     String liveActivityTitle,
-                                                     String cityId,
-                                                     String buildingId,
-                                                     Integer status,
-                                                     @RequestParam(value = "source", defaultValue = "1") Integer source,
+                                                     @RequestParam(value = "cityId", required = false) Integer cityId,
+                                                     @RequestParam(value = "buildingId", required = false) String buildingId,
                                                      @RequestParam(value = "name", required = false) String name,
+                                                     @RequestParam(value = "process", required = false) Integer process,
+                                                     @RequestParam(value = "newHouse", required = false) Boolean newHouse,
                                                      HttpServletRequest request) {
+        if (process != null) {
+            return getPureLiveActivity(pageNum, pageSize, cityId, buildingId, name, process, request);
+        }
+
         ResponseBean responseBean = new ResponseBean();
         try {
-            status = status == null ? 1 : status;
             Integer orgId = getOrgId(request);
-            IPage<LiveAndVideoVO> result = iTaLiveActivityService.getWxLiveActivityAndVideo(pageNum, pageSize, orgId,
-                    liveActivityTitle, cityId, buildingId, status, name, source);
+            IPage<LiveAndVideoVO> pg = new Page<>(pageNum, pageSize);
+            IPage<LiveAndVideoVO> result = iTaLiveActivityService.getWxLiveActivityAndVideo(pg, orgId, cityId, buildingId, name, newHouse);
             responseBean.addSuccess(result);
 
         } catch (Exception e) {
@@ -284,4 +287,17 @@ public class TaLiveActivityController extends BaseController {
         }
         return responseBean;
     }
+
+    private ResponseBean getPureLiveActivity(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                             @RequestParam(value = "cityId", required = false) Integer cityId,
+                                             @RequestParam(value = "buildingId", required = false) String buildingId,
+                                             @RequestParam(value = "name", required = false) String name,
+                                             @RequestParam(value = "process", required = false) Integer process,
+                                             HttpServletRequest request) {
+
+        Integer orgId = getOrgId(request);
+        IPage<TaLiveActivity> pg = new Page<>(pageNum, pageSize);
+        return ResponseBean.success(iTaLiveActivityService.getWxPureLiveActivityList(pg, orgId, cityId, buildingId, name, process));
+    }
 }

src/main/java/com/yunzhi/marketing/entity/TaLiveActivity.java

@@ -172,4 +172,9 @@ public class TaLiveActivity implements Serializable {
 
     @TableField(exist = false)
     private String updateName;
+
+    /**
+     * 是否新房
+     */
+    private Boolean isNewHouse;
 }

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

@@ -51,11 +51,16 @@ public interface TaLiveActivityMapper extends BaseMapper<TaLiveActivity> {
     TaLiveActivity getDetailById(@Param("id")Integer id);
 
     IPage<LiveAndVideoVO> getWxLiveActivityAndVideo(IPage<LiveAndVideoVO> pg,
-                                                    @Param("liveActivityTitle")  String liveActivityTitle,
-                                                    @Param("cityId") String cityId,
+                                                    @Param("cityId") Integer cityId,
                                                     @Param("buildingId") String buildingId,
-                                                    @Param("status") Integer status,
                                                     @Param("orgId") Integer orgId,
                                                     @Param("name") String name,
-                                                    @Param("source") Integer source);
+                                                    @Param("newHouse") Boolean newHouse);
+
+    IPage<TaLiveActivity> getWxPureLiveActivityList(IPage<TaLiveActivity> pg,
+                                                    @Param("cityId") Integer cityId,
+                                                    @Param("buildingId") String buildingId,
+                                                    @Param("orgId") Integer orgId,
+                                                    @Param("name") String name,
+                                                    @Param("process") Integer process);
 }

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

@@ -67,16 +67,13 @@ public interface ITaLiveActivityService extends IService<TaLiveActivity> {
 
     /**
      * 微信小程序查询直播列表
-     * @param pageNum
-     * @param pageSize
      * @param orgId
-     * @param liveActivityTitle
      * @param cityId
      * @param buildingId
-     * @param status
      * @param name
-     * @param source
      * @return
      */
-    IPage<LiveAndVideoVO> getWxLiveActivityAndVideo(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle, String cityId, String buildingId, Integer status, String name, Integer source);
+    IPage<LiveAndVideoVO> getWxLiveActivityAndVideo(IPage<LiveAndVideoVO> pg, Integer orgId, Integer cityId, String buildingId, String name, Boolean newHouse);
+
+    IPage<TaLiveActivity> getWxPureLiveActivityList(IPage<TaLiveActivity> pg, Integer orgId, Integer cityId, String buildingId, String name, Integer process);
 }

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

@@ -201,35 +201,21 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
 
     /**
      * 微信小程序查询直播列表
-     *
-     * @param pageNum
-     * @param pageSize
+     * @param pg
      * @param orgId
-     * @param liveActivityTitle
      * @param cityId
      * @param buildingId
-     * @param status
      * @param name
-     * @param source
      * @return
      */
     @Override
-    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");
-                }
-            }
-        });
+    public IPage<LiveAndVideoVO> getWxLiveActivityAndVideo(IPage<LiveAndVideoVO> pg, Integer orgId, Integer cityId, String buildingId, String name, Boolean newHouse) {
+        IPage<LiveAndVideoVO> wxLiveActivityAndVideo = taLiveActivityMapper.getWxLiveActivityAndVideo(pg, cityId, buildingId, orgId, name, newHouse);
         return wxLiveActivityAndVideo;
     }
+
+    @Override
+    public IPage<TaLiveActivity> getWxPureLiveActivityList(IPage<TaLiveActivity> pg, Integer orgId, Integer cityId, String buildingId, String name, Integer process) {
+        return taLiveActivityMapper.getWxPureLiveActivityList(pg, cityId, buildingId, orgId, name, process);
+    }
 }

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

@@ -238,4 +238,17 @@ public class VideoController extends BaseController {
         return ResponseBean.success(video);
     }
 
+    @GetMapping("/wx/videoActiveList")
+    public ResponseBean getWxVideoActiveList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                     @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                     @RequestParam(value = "cityId", required = false) Integer cityId,
+                                                     @RequestParam(value = "buildingId", required = false) String buildingId,
+                                                     @RequestParam(value = "name", required = false) String name,
+                                                     HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+        IPage<Video> pg = new Page<>(pageNum, pageSize);
+        IPage<Video> result = iVideoService.getWxVideoActiveList(pg, orgId, cityId, buildingId, name);
+        return ResponseBean.success(result);
+    }
+
 }

src/main/java/com/yunzhi/marketing/xlk/entity/Video.java

@@ -118,4 +118,8 @@ public class Video implements Serializable {
      */
     private Boolean isPublish;
 
+    /**
+     * 是否新房
+     */
+    private Boolean isNewHouse;
 }

src/main/java/com/yunzhi/marketing/xlk/mapper/VideoMapper.java

@@ -1,8 +1,10 @@
 package com.yunzhi.marketing.xlk.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.marketing.xlk.entity.Video;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,9 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface VideoMapper extends BaseMapper<Video> {
 
+    IPage<Video> getWxVideoActiveList(IPage<Video> pg,
+                                      @Param("orgId") Integer orgId,
+                                      @Param("cityId") Integer cityId,
+                                      @Param("buildingId") String buildingId,
+                                      @Param("name") String name);
 }

src/main/java/com/yunzhi/marketing/xlk/service/IVideoService.java

@@ -1,5 +1,6 @@
 package com.yunzhi.marketing.xlk.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.marketing.xlk.entity.Video;
 
@@ -13,4 +14,5 @@ import com.yunzhi.marketing.xlk.entity.Video;
  */
 public interface IVideoService extends IService<Video> {
 
+    IPage<Video> getWxVideoActiveList(IPage<Video> pg, Integer orgId, Integer cityId, String buildingId, String name);
 }

src/main/java/com/yunzhi/marketing/xlk/service/impl/VideoServiceImpl.java

@@ -1,9 +1,11 @@
 package com.yunzhi.marketing.xlk.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yunzhi.marketing.xlk.entity.Video;
 import com.yunzhi.marketing.xlk.mapper.VideoMapper;
 import com.yunzhi.marketing.xlk.service.IVideoService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -16,5 +18,11 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements IVideoService {
+    @Autowired
+    VideoMapper videoMapper;
 
+    @Override
+    public IPage<Video> getWxVideoActiveList(IPage<Video> pg, Integer orgId, Integer cityId, String buildingId, String name) {
+        return videoMapper.getWxVideoActiveList(pg, orgId, cityId, buildingId, name);
+    }
 }

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -85,17 +85,27 @@
             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
-            where 1=1
+            where t.org_id = #{orgId}
+              and t.`status` = 1
         <if test="name != null and name != ''">
             and (t.live_activity_title like CONCAT('%', #{name}, '%')
             or a.building_name like CONCAT('%', #{name}, '%'))
         </if>
+        <if test="cityId != null">
+            and (t.city_id is null or t.city_id = #{cityId})
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and t.building_id = #{buildingId}
+        </if>
+        <if test="newHouse">
+            and t.is_new_house = #{newHouse}
+        </if>
     UNION
         SELECT
             t.video_id as id,
             t.NAME AS title,
-            t.CREATED_TIME AS startTime,
-            t.CREATED_TIME AS endTime,
+            null AS start_time,
+            null AS end_time,
             t.vide_img as images,
             a.building_name,
             b.NAME AS city_name,
@@ -104,10 +114,47 @@
             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
+        where t.org_id = #{orgId}
+            and t.is_publish = 1
         <if test="name != null and name != ''">
             and (t.NAME like CONCAT('%', #{name}, '%') or a.building_name like CONCAT('%', #{name}, '%'))
         </if>
+        <if test="cityId != null">
+            and (t.city_id is null or t.city_id = #{cityId})
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and t.building_id = #{buildingId}
+        </if>
+        <if test="newHouse">
+            and t.is_new_house = #{newHouse}
+        </if>
+    </select>
+    <select id="getWxPureLiveActivityList" resultType="com.yunzhi.marketing.entity.TaLiveActivity">
+        SELECT
+         t.*
+        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
+        where t.org_id = #{orgId}
+        and t.`status` = 1
+        <if test="name != null and name != ''">
+            and (t.live_activity_title like CONCAT('%', #{name}, '%')
+            or a.building_name like CONCAT('%', #{name}, '%'))
+        </if>
+        <if test="cityId != null">
+            and (t.city_id is null or t.city_id = #{cityId})
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and t.building_id = #{buildingId}
+        </if>
+        <if test="process = 1">
+            and t.live_start_date &gt; now()
+        </if>
+        <if test="process = 2">
+            and t.live_start_date &lt; now()
+            and t.live_end_date &gt; now()
+        </if>
     </select>
 
 </mapper>

src/main/resources/mapper/xlk/VideoMapper.xml

@@ -2,4 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.marketing.xlk.mapper.VideoMapper">
 
+    <select id="getWxVideoActiveList" resultType="com.yunzhi.marketing.xlk.entity.Video">
+        SELECT
+         t.*
+        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 t.org_id = #{orgId}
+        and t.is_publish = 1
+        <if test="name != null and name != ''">
+            and (t.NAME like CONCAT('%', #{name}, '%') or a.building_name like CONCAT('%', #{name}, '%'))
+        </if>
+        <if test="cityId != null">
+            and (t.city_id is null or t.city_id = #{cityId})
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and t.building_id = #{buildingId}
+        </if>
+    </select>
 </mapper>