代码调整

src/main/java/com/caimei/www/controller/unlimited/SinglePageController.java

@@ -110,26 +110,6 @@ public class SinglePageController extends BaseController {
         return REPAIR_PATH;
     }
 
-    /**
-     * 二级专题数据
-     * @return
-     */
-    @GetMapping("/page/topic")
-    @ResponseBody
-    public JsonModel<List<PageFloor>> getTopicDataById(@RequestParam("type") Integer id) {
-        return singlePageService.getTopicDataById(id);
-    }
-
-    /**
-     * 专题活动列表数据
-     * @return
-     */
-    @GetMapping("/promotions/list")
-    @ResponseBody
-    public JsonModel<PageInfo<ImageLink>> gePromotionsList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
-        return singlePageService.gePromotionsList(pageNum, pageSize);
-    }
-
     /**
      * 品牌招商表格下载
      */

src/main/java/com/caimei/www/mapper/SinglePageDao.java

@@ -49,13 +49,6 @@ public interface SinglePageDao {
      */
     List<ImageLink> getDataByFloorId(Integer floorId);
 
-    /**
-     * 专题活动列表数据
-     *
-     * @return
-     */
-    List<ImageLink> getPromotionsList();
-
     /**
      * 采美直播
      *

src/main/java/com/caimei/www/service/page/SinglePageService.java

@@ -26,10 +26,6 @@ public interface SinglePageService {
     PageContent getTopicPageById(Integer id);
     /** 采美直播 */
     PageContent getLivePageData();
-    /** 二级专题数据 */
-    JsonModel<List<PageFloor>> getTopicDataById(Integer id);
-    /** 专题活动列表数据 */
-    JsonModel<PageInfo<ImageLink>> gePromotionsList(int pageNum, int pageSize);
     /** 品牌招商表格下载 */
     Mono<Void> downloadByWriteWith(ServerHttpResponse response) throws UnsupportedEncodingException, FileNotFoundException;
     /** 获取讲师列表 */

src/main/java/com/caimei/www/service/page/impl/SinglePageServiceImpl.java

@@ -83,65 +83,6 @@ public class SinglePageServiceImpl implements SinglePageService {
         return singlePageDao.getLivePageData();
     }
 
-    /**
-     * 二级专题数据
-     *
-     * @param id
-     */
-    @Override
-    public JsonModel<List<PageFloor>> getTopicDataById(Integer id) {
-        if (id == null) {
-            return JsonModel.error("参数异常", null);
-        }
-        List<PageFloor> pageFloors = singlePageDao.getFloorByPageId(id);
-        if (!CollectionUtils.isEmpty(pageFloors)) {
-            pageFloors.forEach(floor -> {
-                List<ImageLink> floorData = singlePageDao.getDataByFloorId(floor.getId());
-                if (!CollectionUtils.isEmpty(floorData)) {
-                    floorData.forEach(data -> {
-                        data.setImage(ImageUtil.getImageURL("actType", data.getImage(), 0, domain));
-                    });
-                }
-                floor.setFloorData(floorData);
-            });
-        }
-        return JsonModel.success(pageFloors);
-    }
-
-    /**
-     * 专题活动列表数据
-     *
-     * @param pageNum
-     * @param pageSize
-     */
-    @Override
-    public JsonModel<PageInfo<ImageLink>> gePromotionsList(int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        List<ImageLink> promotionsList = singlePageDao.getPromotionsList();
-        if (!CollectionUtils.isEmpty(promotionsList)) {
-            long currentTime = System.currentTimeMillis();
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            promotionsList.forEach(item -> {
-                //已结束
-                item.setStatus(3);
-                String format = "";
-                if (null != item.getBeginTime() && null != item.getEndTime() && (item.getEndTime().getTime() > item.getBeginTime().getTime()) && (item.getBeginTime().getTime() > currentTime)) {
-                    //即将开始: 活动开始时间小于当前时间
-                    item.setStatus(1);
-                    format = sdf.format(item.getBeginTime()) + "～" + sdf.format(item.getEndTime());
-                }
-                if (null != item.getBeginTime() && null != item.getEndTime() && (item.getEndTime().getTime() > currentTime) && (item.getBeginTime().getTime() < currentTime)) {
-                    //进行中: 当前时间小于活动开始，小于活动结束时间
-                    item.setStatus(2);
-                    format = sdf.format(item.getBeginTime()) + "～" + sdf.format(item.getEndTime());
-                }
-                item.setDetail(format);
-            });
-        }
-        PageInfo<ImageLink> pageInfo = new PageInfo(promotionsList);
-        return JsonModel.success(pageInfo);
-    }
-
     /**
      * 品牌招商表格下载
      *

src/main/resources/mapper/SinglePageMapper.xml

@@ -36,17 +36,6 @@
         where b.centreId=#{floorId} and  a.enabledStatus=1
         order  by a.sort desc,a.createDate desc
     </select>
-    <select id="getPromotionsList" resultType="com.caimei.www.pojo.page.ImageLink">
-        select  a.id as id,
-                a.title as title,
-                a.link as link,
-                a.image as image,
-                a.beginTime as beginTime,
-                a.endTime as endTime
-        from cm_page_image a
-        where a.type=4 and a.enabledStatus=1
-        order by a.sort desc,a.createDate desc
-    </select>
     <select id="getLiveTeachers" resultType="com.caimei.www.pojo.page.ImageLink">
         select  a.id as id,
                 a.title as title,