live and video

src/main/java/com/yunzhi/marketing/center/taUser/entity/TaUser.java

@@ -114,6 +114,11 @@ public class TaUser implements Serializable {
     private String photo;
     private String description;
 
+    /**
+     * 工号
+     */
+    private String jobNumber;
+
     /**
      * 权重
      */

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

@@ -11,6 +11,8 @@ import com.yunzhi.marketing.entity.TaLiveActivity;
 import com.yunzhi.marketing.reportCustomerAop.ReportCustomer;
 import com.yunzhi.marketing.service.IExtendContentService;
 import com.yunzhi.marketing.service.ITaLiveActivityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +32,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "直播活动", tags = "xlk-直播活动")
 public class TaLiveActivityController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaLiveActivityController.class);
@@ -254,6 +257,7 @@ public class TaLiveActivityController extends BaseController {
      * @param request
      * @return
      */
+    @ApiOperation(value = "wx-视频直播列表", notes = "admin-视频直播列表")
     @RequestMapping(value = "/wx/taLiveActivity", method = RequestMethod.GET)
     public ResponseBean taLiveActivityListForMiniApp(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
@@ -262,13 +266,14 @@ public class TaLiveActivityController extends BaseController {
                                                      String buildingId,
                                                      Integer status,
                                                      @RequestParam(value = "source", defaultValue = "1") Integer source,
+                                                     @RequestParam(value = "buildingName", required = false) Integer buildingName,
                                                      HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             status = status == null ? 1 : status;
             Integer orgId = getOrgId(request);
-            IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, orgId,
-                    liveActivityTitle, cityId, buildingId, status, null, null, source);
+            IPage<TaLiveActivity> result = iTaLiveActivityService.getWxLiveActivityAndVideo(pageNum, pageSize, orgId,
+                    liveActivityTitle, cityId, buildingId, status, buildingName, source);
             responseBean.addSuccess(result);
 
         } catch (Exception e) {

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

@@ -48,4 +48,13 @@ public interface TaLiveActivityMapper extends BaseMapper<TaLiveActivity> {
     void updateLiveActivityStatus(@Param("orgId") Integer orgId, @Param("taLiveActivityList") List<TaLiveActivity> taLiveActivityList);
 
     TaLiveActivity getDetailById(@Param("id")Integer id);
+
+    IPage<TaLiveActivity> getWxLiveActivityAndVideo(IPage<TaLiveActivity> 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("source") Integer source);
 }

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

@@ -63,4 +63,19 @@ public interface ITaLiveActivityService extends IService<TaLiveActivity> {
     ResponseBean delLiveActivityList(Integer orgId, List<TaLiveActivity> liveActivityList);
 
     ResponseBean getDetailById(Integer id);
+
+    /**
+     * 微信小程序查询直播列表
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param liveActivityTitle
+     * @param cityId
+     * @param buildingId
+     * @param status
+     * @param buildingName
+     * @param source
+     * @return
+     */
+    IPage<TaLiveActivity> getWxLiveActivityAndVideo(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle, String cityId, String buildingId, Integer status, Integer buildingName, Integer source);
 }

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

@@ -196,4 +196,24 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
         responseBean.addSuccess(taLiveActivityMapper.getDetailById(id));
         return responseBean;
     }
+
+    /**
+     * 微信小程序查询直播列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param liveActivityTitle
+     * @param cityId
+     * @param buildingId
+     * @param status
+     * @param buildingName
+     * @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);
+    }
 }

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

@@ -58,7 +58,7 @@ public class BrandController extends BaseController {
      * @param pageSize
      * @return
      */
-    @ApiOperation(value = "品牌开发商表列表", notes = "品牌开发商表列表")
+    @ApiOperation(value = "admin-品牌开发商表列表", notes = "admin-品牌开发商表列表")
     @RequestMapping(value="/admin/brand",method= RequestMethod.GET)
     public ResponseBean brandList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, @RequestHeader("authorization") String token,HttpServletRequest request){
@@ -85,7 +85,7 @@ public class BrandController extends BaseController {
      * @param brandDTO 实体对象
      * @return
      */
-    @ApiOperation(value = "添加品牌开发商表", notes = "添加品牌开发商表")
+    @ApiOperation(value = "admin-添加品牌开发商表", notes = "admin-添加品牌开发商表")
     @RequestMapping(value="/admin/brand",method= RequestMethod.POST)
     public ResponseBean brandAdd(@RequestBody BrandDTO brandDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -112,7 +112,7 @@ public class BrandController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @ApiOperation(value = "删除品牌开发商表", notes = "删除品牌开发商表")
+    @ApiOperation(value = "admin-删除品牌开发商表", notes = "admin-删除品牌开发商表")
     @RequestMapping(value="/admin/brand/{id}", method= RequestMethod.DELETE)
     public ResponseBean brandDelete(@PathVariable String id, @RequestHeader("authorization") String token){
         ResponseBean responseBean = new ResponseBean();
@@ -144,7 +144,7 @@ public class BrandController extends BaseController {
      * @param brandDTO 实体对象
      * @return
      */
-    @ApiOperation(value = "修改品牌开发商表", notes = "修改品牌开发商表")
+    @ApiOperation(value = "admin-修改品牌开发商表", notes = "admin-修改品牌开发商表")
     @RequestMapping(value="/admin/brand/{id}",method= RequestMethod.PUT)
     public ResponseBean brandUpdate(@PathVariable("id") String id,@RequestBody BrandDTO brandDTO,@RequestHeader("authorization") String token,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -179,7 +179,7 @@ public class BrandController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @ApiOperation(value = "获取品牌开发商表详情数据", notes = "获取品牌开发商表详情数据")
+    @ApiOperation(value = "admin-获取品牌开发商表详情数据", notes = "admin-获取品牌开发商表详情数据")
     @RequestMapping(value="/admin/brand/{id}",method= RequestMethod.GET)
     public ResponseBean brandGet(@PathVariable String id, @RequestHeader("authorization") String token){
         ResponseBean responseBean = new ResponseBean();

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

@@ -54,7 +54,7 @@ public class CurriculumController extends BaseController {
      * @param pageSize
      * @return
      */
-    @ApiOperation(value = "查询课程表列表", notes = "查询课程表列表")
+    @ApiOperation(value = "admin-查询课程表列表", notes = "admin-查询课程表列表")
     @RequestMapping(value="/admin/curriculum",method= RequestMethod.GET)
     public ResponseBean curriculumList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
@@ -83,7 +83,7 @@ public class CurriculumController extends BaseController {
      * @param curriculumDTO 实体对象
      * @return
      */
-    @ApiOperation(value = "新增课程表", notes = "新增课程表")
+    @ApiOperation(value = "admin-新增课程表", notes = "admin-新增课程表")
     @RequestMapping(value="/admin/curriculum",method= RequestMethod.POST)
     public ResponseBean curriculumAdd(@RequestBody CurriculumDTO curriculumDTO,
                                       @RequestHeader("authorization") String token, HttpServletRequest request){
@@ -111,7 +111,7 @@ public class CurriculumController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @ApiOperation(value = "根据id删除课程表", notes = "根据id删除课程表")
+    @ApiOperation(value = "admin-根据id删除课程表", notes = "admin-根据id删除课程表")
     @ResponseBody
     @RequestMapping(value="/admin/curriculum/{id}", method= RequestMethod.DELETE)
     public ResponseBean curriculumDelete(@PathVariable String id,
@@ -137,7 +137,7 @@ public class CurriculumController extends BaseController {
      * @param curriculumDTO 实体对象
      * @return
      */
-    @ApiOperation(value = "根据id修改课程表", notes = "根据id修改课程表")
+    @ApiOperation(value = "admin-根据id修改课程表", notes = "admin-根据id修改课程表")
     @RequestMapping(value="/admin/curriculum/{id}",method= RequestMethod.PUT)
     public ResponseBean curriculumUpdate(@PathVariable String id,
                                         @RequestBody CurriculumDTO curriculumDTO,
@@ -164,7 +164,7 @@ public class CurriculumController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @ApiOperation(value = "根据id查询课程表详情", notes = "根据id查询课程表详情")
+    @ApiOperation(value = "admin-根据id查询课程表详情", notes = "admin-根据id查询课程表详情")
     @RequestMapping(value="/admin/curriculum/{id}",method= RequestMethod.GET)
     public ResponseBean curriculumGet(@PathVariable String id,
                                       @RequestHeader("authorization") String token, HttpServletRequest request){

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

@@ -59,7 +59,7 @@ public class SearchHouseController extends BaseController {
      * @param pageSize
      * @return
      */
-    @ApiOperation(value = "获取帮我找房列表", notes = "获取帮我找房列表")
+    @ApiOperation(value = "admin-获取帮我找房列表", notes = "admin-获取帮我找房列表")
     @RequestMapping(value="/admin/searchHouse",method= RequestMethod.GET)
     public ResponseBean searchHouseList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
@@ -84,7 +84,7 @@ public class SearchHouseController extends BaseController {
      * @param searchHouseDTO 实体对象
      * @return
      */
-    @ApiOperation(value = "保存帮我找房需求", notes = "保存帮我找房需求")
+    @ApiOperation(value = "wx-保存帮我找房需求", notes = "wx-保存帮我找房需求")
     @RequestMapping(value="/wx/searchHouse",method= RequestMethod.POST)
     public ResponseBean searchHouseAdd(@RequestBody SearchHouseDTO searchHouseDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -120,7 +120,7 @@ public class SearchHouseController extends BaseController {
      * @param searchHouse 实体对象
      * @return
      */
-    @ApiOperation(value = "修改帮我找房需求", notes = "修改帮我找房需求")
+    @ApiOperation(value = "admin-修改帮我找房需求", notes = "admin-修改帮我找房需求")
     @RequestMapping(value="/admin/searchHouse/{id}",method= RequestMethod.PUT)
     public ResponseBean searchHouseUpdate(@PathVariable String id,
                                           @RequestBody SearchHouse searchHouse, @RequestHeader("authorization") String token, HttpServletRequest request){
@@ -144,7 +144,7 @@ public class SearchHouseController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @ApiOperation(value = "根据id查询帮我找房需求详情", notes = "根据id查询帮我找房需求详情")
+    @ApiOperation(value = "admin-根据id查询帮我找房需求详情", notes = "admin-根据id查询帮我找房需求详情")
     @RequestMapping(value="/admin/searchHouse/{id}",method= RequestMethod.GET)
     public ResponseBean searchHouseGet(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();

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

@@ -54,7 +54,7 @@ public class VideoController extends BaseController {
      * @param pageSize
      * @return
      */
-    @ApiOperation(value = "视频列表", notes = "视频列表")
+    @ApiOperation(value = "admin-视频列表", notes = "admin-视频列表")
     @RequestMapping(value="/admin/video",method= RequestMethod.GET)
     public ResponseBean videoList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
@@ -85,7 +85,7 @@ public class VideoController extends BaseController {
      * @param videoDTO 实体对象
      * @return
      */
-    @ApiOperation(value = "添加视频", notes = "添加视频")
+    @ApiOperation(value = "admin-添加视频", notes = "admin-添加视频")
     @RequestMapping(value="/admin/video",method= RequestMethod.POST)
     public ResponseBean videoAdd(@RequestBody VideoDTO videoDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -112,7 +112,7 @@ public class VideoController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @ApiOperation(value = "根据id删除视频", notes = "根据id删除视频")
+    @ApiOperation(value = "admin-根据id删除视频", notes = "admin-根据id删除视频")
     @ResponseBody
     @RequestMapping(value="/admin/video/{id}", method= RequestMethod.DELETE)
     public ResponseBean videoDelete(@PathVariable String id,@RequestHeader("authorization") String token){
@@ -137,7 +137,7 @@ public class VideoController extends BaseController {
      * @param videoDTO 实体对象
      * @return
      */
-    @ApiOperation(value = "根据id修改视频", notes = "根据id修改视频")
+    @ApiOperation(value = "admin-根据id修改视频", notes = "admin-根据id修改视频")
     @RequestMapping(value="/admin/video/{id}",method= RequestMethod.PUT)
     public ResponseBean videoUpdate(@PathVariable String id,
                                         @RequestBody VideoDTO videoDTO,@RequestHeader("authorization") String token){
@@ -163,7 +163,7 @@ public class VideoController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @ApiOperation(value = "根据id查询详情", notes = "根据id查询详情")
+    @ApiOperation(value = "admin-根据id查询详情", notes = "admin-根据id查询详情")
     @RequestMapping(value="/admin/video/{id}",method= RequestMethod.GET)
     public ResponseBean videoGet(@PathVariable String id,@RequestHeader("authorization") String token){
         ResponseBean responseBean = new ResponseBean();
@@ -176,4 +176,31 @@ public class VideoController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @return
+     */
+    @ApiOperation(value = "admin-根据id发布或取消发布视频", notes = "admin-根据id发布或取消发布视频")
+    @RequestMapping(value="/admin/publish/{id}",method= RequestMethod.PUT)
+    public ResponseBean publishVideo(@PathVariable String id,@RequestHeader("authorization") String token){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Video video = iVideoService.getById(id);
+            video.setIsPublish(!video.getIsPublish());
+            if (iVideoService.updateById(video)){
+                responseBean.addSuccess(video);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("videoUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
 }

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

@@ -102,5 +102,14 @@ public class Video implements Serializable {
     @TableField("WEIGHT")
     private Integer weight;
 
+    /**
+     * 阅读人数
+     */
+    private Integer lookNum;
+
+    /**
+     * 是否发布
+     */
+    private Boolean isPublish;
 
 }

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -71,4 +71,27 @@
         where t.live_activity_id = #{id}
     </select>
 
+    <select id="getWxLiveActivityAndVideo" resultType="com.yunzhi.marketing.entity.TaLiveActivity">
+        SELECT
+            t.live_activity_title AS title,
+            t.live_start_date AS startTime,
+            t.live_end_date AS endTime,
+            a.building_name,
+            b.NAME AS city_name
+        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
+        SELECT
+            t.NAME AS title,
+            t.CREATED_TIME AS startTime,
+            t.CREATED_TIME AS endTime,
+            a.building_name,
+            b.NAME AS city_name
+        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
+    </select>
+
 </mapper>