课程调整

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

@@ -7,6 +7,8 @@ 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.service.ITaPersonService;
 import com.yunzhi.marketing.xlk.dto.CurriculumDTO;
 import com.yunzhi.marketing.xlk.entity.Brand;
 import com.yunzhi.marketing.xlk.entity.Video;
@@ -29,6 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -48,6 +51,9 @@ public class CurriculumController extends BaseController {
     @Autowired
     public ICurriculumService iCurriculumService;
 
+    @Autowired
+    public ITaPersonService taPersonService;
+
 
     /**
      * 分页查询列表
@@ -183,4 +189,68 @@ public class CurriculumController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "wx-查询课程表列表", notes = "wx-查询课程表列表")
+    @RequestMapping(value="/wx/curriculum",method= RequestMethod.GET)
+    public ResponseBean wxCurriculumList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value ="name",required = false) String name,
+                                       @RequestParam(value ="roleId",required = false) Integer roleId,
+                                       @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<Curriculum> pg = new Page<>(pageNum, pageSize);
+            LambdaQueryWrapper<Curriculum> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(Curriculum::getOrgId,getOrgId(request));
+            queryWrapper.eq(!StringUtils.isEmpty(name),Curriculum::getName,name);
+            queryWrapper.eq(null != roleId,Curriculum::getRoleId,roleId);
+            queryWrapper.orderByDesc(Curriculum::getWeight);
+            queryWrapper.orderByDesc(Curriculum::getCreatedTime);
+
+            IPage<Curriculum> result = iCurriculumService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("curriculumList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "wx-查询我收藏的课程表列表", notes = "wx-查询我收藏的课程表列表")
+    @RequestMapping(value="/wx/curriculum/save",method= RequestMethod.GET)
+    public ResponseBean saveCurriculumList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                         @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+
+            String openid = getOpenId(request);
+            List<TaPerson> persons = taPersonService.getPersonsByOpenId(openid);
+            if (null == persons || persons.size() == 0) {
+                return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaPerson person = persons.get(0);
+            IPage<Curriculum> result = iCurriculumService.selectMySaveList(pageNum,pageSize,person);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("curriculumList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -1,8 +1,10 @@
 package com.yunzhi.marketing.xlk.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.marketing.xlk.entity.Curriculum;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface CurriculumMapper extends BaseMapper<Curriculum> {
 
+    IPage<Curriculum> selectMySaveList(IPage<Curriculum> pg,@Param("personId") String personId);
 }

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

@@ -1,5 +1,7 @@
 package com.yunzhi.marketing.xlk.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.marketing.entity.TaPerson;
 import com.yunzhi.marketing.xlk.entity.Curriculum;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +15,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ICurriculumService extends IService<Curriculum> {
 
+    /**
+     * 获取我的收藏列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param person
+     * @return
+     */
+    IPage<Curriculum> selectMySaveList(Integer pageNum, Integer pageSize, TaPerson person);
 }

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

@@ -1,9 +1,13 @@
 package com.yunzhi.marketing.xlk.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.entity.TaPerson;
 import com.yunzhi.marketing.xlk.entity.Curriculum;
 import com.yunzhi.marketing.xlk.mapper.CurriculumMapper;
 import com.yunzhi.marketing.xlk.service.ICurriculumService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.marketing.xlk.vo.SearchHouseVO;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +21,18 @@ import org.springframework.stereotype.Service;
 @Service
 public class CurriculumServiceImpl extends ServiceImpl<CurriculumMapper, Curriculum> implements ICurriculumService {
 
+    /**
+     * 获取我的收藏列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param person
+     * @return
+     */
+    @Override
+    public IPage<Curriculum> selectMySaveList(Integer pageNum, Integer pageSize, TaPerson person) {
+        IPage<Curriculum> pg = new Page<>(pageNum, pageSize);
+        IPage<Curriculum> result = this.baseMapper.selectMySaveList(pg,person.getPersonId());
+        return result;
+    }
 }

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

@@ -2,4 +2,14 @@
 <!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.CurriculumMapper">
 
+    <select id="selectMySaveList" resultType="com.yunzhi.marketing.xlk.entity.Curriculum">
+        SELECT
+        x.*
+        FROM
+        ta_save t
+        LEFT JOIN xlk_curriculum x ON t.save_id = x.curriculum_id
+        WHERE
+        t.saved_target = "curriculum"
+        AND t.person_id = #{personId}
+    </select>
 </mapper>