修改精彩活动

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityList.java

@@ -95,7 +95,7 @@ public class ActivityList implements Serializable {
      */
     @Column(name = "picture")
 	@ApiModelProperty(value = "活动图片")
-    private Integer picture;
+    private String picture;
 
 	/**
 	 * 活动类型
@@ -109,7 +109,7 @@ public class ActivityList implements Serializable {
 	 */
 	@Column(name = "url")
 	@ApiModelProperty(value = "活动页面链接")
-	private Integer url;
+	private String url;
 
 
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityListBiz.java

@@ -5,6 +5,11 @@ import org.springframework.stereotype.Service;
 import com.xxfc.platform.activity.entity.ActivityList;
 import com.xxfc.platform.activity.mapper.ActivityListMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.weekend.WeekendSqls;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
 
 /**
  * 活动（活动列表）
@@ -15,4 +20,15 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
  */
 @Service
 public class ActivityListBiz extends BaseBiz<ActivityListMapper,ActivityList> {
+    public List<ActivityList> activities () throws InvocationTargetException, IllegalAccessException {
+        long currentTime = System.currentTimeMillis();
+        Example exa=Example.builder(ActivityList.class).where(WeekendSqls.<ActivityList>custom()
+                .andGreaterThanOrEqualTo(ActivityList::getEndTime,currentTime)
+                .andLessThanOrEqualTo(ActivityList::getStartTime,currentTime)
+                .andEqualTo(ActivityList::getStatus,1)
+        ).orderByAsc("sort").build();
+        List<ActivityList> activityLists = selectByExample(exa);
+
+        return activityLists;
+    }
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityManagementBiz.java

@@ -34,18 +34,12 @@ public class ActivityManagementBiz extends BaseBiz<ActivityManagementMapper, Act
      * @throws IllegalAccessException
      */
     public List<ActivityList> selectedActivityManagement() throws InvocationTargetException, IllegalAccessException {
-        long currentTime = System.currentTimeMillis();
-        Example exa=Example.builder(ActivityList.class).where(WeekendSqls.<ActivityList>custom()
-                .andGreaterThanOrEqualTo(ActivityList::getEndTime,currentTime)
-                .andLessThanOrEqualTo(ActivityList::getStartTime,currentTime)
-        ).orderByAsc("sort").build();
-        activityListBiz.selectByExample(exa);
         List<ActivityList> activityLists = activityListBiz.selectListAll();
-
-
         return activityLists;
     }
 
+
+
     /**
      * 根据活动id获取活动详情
      * @param activityId

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityListController.java

 package com.xxfc.platform.activity.rest;
 
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.activity.biz.ActivityListBiz;
 import com.xxfc.platform.activity.entity.ActivityList;
+import com.xxfc.platform.activity.entity.ActivityManagement;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+
 @RestController
 @RequestMapping("activityList")
 public class ActivityListController extends BaseController<ActivityListBiz,ActivityList> {
+    /**
+     * 精彩活动列表
+     * @return
+     * @throws InvocationTargetException
+     * @throws IllegalAccessException
+     */
+    @GetMapping("/app/unauth/activity/findAll")
+    public ObjectRestResponse<List<ActivityList>>  appFindAll() throws InvocationTargetException, IllegalAccessException {
+        List<ActivityList> list= baseBiz.activities();
+        return ObjectRestResponse.succ(list);
+    }
+
 
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityManagementController.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @author Administrator
  */
 @RestController
-@RequestMapping("Management")
+@RequestMapping("management")
 public class ActivityManagementController extends BaseController<ActivityManagementBiz, ActivityManagement> {
 
     /**
@@ -31,17 +31,6 @@ public class ActivityManagementController extends BaseController<ActivityManagem
       return ObjectRestResponse.succ(list);
     }
 
-    /**
-     * 精彩活动列表
-     * @return
-     * @throws InvocationTargetException
-     * @throws IllegalAccessException
-     */
-    @RequestMapping("/app/unauth/activity/findAll")
-    public ObjectRestResponse<List<ActivityManagement>>  appFindAll() throws InvocationTargetException, IllegalAccessException {
-        List<ActivityList> list= baseBiz.selectedActivityManagement();
-        return ObjectRestResponse.succ(list);
-    }
 
     /**
      * 查找一条